Skip to content

Commit 779b8dc

Browse files
author
Benedikt Hegner
committed
Merge branch 'develop' of https://github.com/LLNL/spack into binary_packages
2 parents 5911b0b + e7ced54 commit 779b8dc

629 files changed

Lines changed: 14886 additions & 2746 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.coveragerc‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# -*- conf -*-
2+
# .coveragerc to control coverage.py
3+
[run]
4+
branch = True
5+
source = lib
6+
omit =
7+
lib/spack/spack/test/*
8+
lib/spack/env/*
9+
lib/spack/docs/*
10+
lib/spack/external/*
11+
12+
[report]
13+
# Regexes for lines to exclude from consideration
14+
exclude_lines =
15+
# Have to re-enable the standard pragma
16+
pragma: no cover
17+
18+
# Don't complain about missing debug-only code:
19+
def __repr__
20+
if self\.debug
21+
22+
# Don't complain if tests don't hit defensive assertion code:
23+
raise AssertionError
24+
raise NotImplementedError
25+
26+
# Don't complain if non-runnable code isn't run:
27+
if 0:
28+
if False:
29+
if __name__ == .__main__.:
30+
31+
ignore_errors = True
32+
33+
[html]
34+
directory = htmlcov

‎.flake8‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# -*- conf -*-
2+
# flake8 settings for Spack.
3+
#
4+
# Below we describe which flake8 checks Spack ignores and what the
5+
# rationale is.
6+
#
7+
# Let people line things up nicely:
8+
# - E221: multiple spaces before operator
9+
# - E241: multiple spaces after ‘,’
10+
#
11+
# Spack allows wildcard imports:
12+
# - F403: disable wildcard import
13+
#
14+
# These are required to get the package.py files to test clean.
15+
# - F821: undefined name (needed for cmake, configure, etc.)
16+
# - F999: name name be undefined or undefined from star imports.
17+
#
18+
[flake8]
19+
ignore = E221,E241,F403,F821,F999
20+
max-line-length = 79

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@
99
/share/spack/dotkit
1010
/share/spack/modules
1111
/TAGS
12+
/htmlcov
13+
.coverage

‎.travis.yml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,35 @@ python:
66
# Use new Travis infrastructure (Docker can't sudo yet)
77
sudo: false
88

9-
# No need to install any deps.
10-
install: true
9+
# Install coveralls to obtain code coverage
10+
install:
11+
- "pip install coveralls"
12+
- "pip install flake8"
1113

1214
before_install:
1315
# Need this for the git tests to succeed.
1416
- git config --global user.email "spack@example.com"
1517
- git config --global user.name "Test User"
1618

19+
# Need this to be able to compute the list of changed files
20+
- git fetch origin develop:develop
21+
1722
script:
23+
# Regular spack setup and tests
1824
- . share/spack/setup-env.sh
1925
- spack compilers
2026
- spack config get compilers
21-
- spack test
2227
- spack install -v libdwarf
2328

29+
# Run unit tests with code coverage
30+
- coverage run bin/spack test
31+
32+
# Run flake8 code style checks.
33+
- share/spack/qa/run-flake8
34+
35+
after_success:
36+
- coveralls
37+
2438
notifications:
2539
email:
2640
recipients:

‎LICENSE‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,62 @@
1-
Copyright (c) 2013-2014, Lawrence Livermore National Security, LLC.
1+
########################################################################
2+
GNU LESSER GENERAL PUBLIC LICENSE (Lesser GPL)
3+
Version 2.1, February 1999
4+
########################################################################
5+
Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
26
Produced at the Lawrence Livermore National Laboratory.
37

48
This file is part of Spack.
5-
Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
9+
Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
610
LLNL-CODE-647188
711

812
For details, see https://github.com/llnl/spack
913

1014
This program is free software; you can redistribute it and/or modify
11-
it under the terms of the GNU General Public License (as published by
12-
the Free Software Foundation) version 2.1 dated February 1999.
15+
it under the terms of the GNU Lesser General Public License (as
16+
published by the Free Software Foundation) version 2.1, February 1999.
1317

1418
This program is distributed in the hope that it will be useful, but
1519
WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
1620
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
17-
conditions of the GNU General Public License for more details.
21+
conditions of the GNU Lesser General Public License for more details.
1822

19-
You should have received a copy of the GNU Lesser General Public License
20-
along with this program; if not, write to the Free Software Foundation,
21-
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23+
You should have received a copy of the GNU Lesser General Public
24+
License along with this program; if not, write to the Free Software
25+
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2226

23-
OUR NOTICE AND TERMS AND CONDITIONS OF THE GNU GENERAL PUBLIC LICENSE
27+
########################################################################
28+
LLNL NOTICE AND TERMS AND CONDITIONS OF THE GNU LGPL
2429

25-
Our Preamble Notice
30+
LLNL Preamble Notice
2631

27-
A. This notice is required to be provided under our contract with the
28-
U.S. Department of Energy (DOE). This work was produced at the
29-
Lawrence Livermore National Laboratory under Contract
30-
No. DE-AC52-07NA27344 with the DOE.
32+
A. This notice is required to be provided under LLNL's contract with
33+
the U.S. Department of Energy (DOE). This work was produced at the
34+
Lawrence Livermore National Laboratory under Contract
35+
No. DE-AC52-07NA27344 with the DOE.
3136

3237
B. Neither the United States Government nor Lawrence Livermore
33-
National Security, LLC nor any of their employees, makes any warranty,
34-
express or implied, or assumes any liability or responsibility for the
35-
accuracy, completeness, or usefulness of any information, apparatus,
36-
product, or process disclosed, or represents that its use would not
37-
infringe privately-owned rights.
38+
National Security, LLC nor any of their employees, makes any
39+
warranty, express or implied, or assumes any liability or
40+
responsibility for the accuracy, completeness, or usefulness of any
41+
information, apparatus, product, or process disclosed, or
42+
represents that its use would not infringe privately-owned rights.
3843

3944
C. Also, reference herein to any specific commercial products,
40-
process, or services by trade name, trademark, manufacturer or
41-
otherwise does not necessarily constitute or imply its endorsement,
42-
recommendation, or favoring by the United States Government or
43-
Lawrence Livermore National Security, LLC. The views and opinions of
44-
authors expressed herein do not necessarily state or reflect those of
45-
the United States Government or Lawrence Livermore National Security,
46-
LLC, and shall not be used for advertising or product endorsement
47-
purposes.
45+
process, or services by trade name, trademark, manufacturer or
46+
otherwise does not necessarily constitute or imply its endorsement,
47+
recommendation, or favoring by the United States Government or
48+
Lawrence Livermore National Security, LLC. The views and opinions
49+
of authors expressed herein do not necessarily state or reflect
50+
those of the United States Government or Lawrence Livermore
51+
National Security, LLC, and shall not be used for advertising or
52+
product endorsement purposes.
4853

4954
The precise terms and conditions for copying, distribution and
5055
modification follows.
5156

52-
GNU Lesser GPL terms and Conditions for Copying, Distribution, and
53-
Modification
57+
########################################################################
58+
GNU LESSER GENERAL PUBLIC LICENSE
59+
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
5460

5561
0. This License Agreement applies to any software library or other
5662
program which contains a notice placed by the copyright holder or

‎README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
![image](share/spack/logo/spack-logo-text-64.png "Spack")
22
============
33

4-
[![Build Status](https://travis-ci.org/LLNL/spack.png?branch=develop)](https://travis-ci.org/LLNL/spack)
4+
[![Build Status](https://travis-ci.org/LLNL/spack.svg?branch=develop)](https://travis-ci.org/LLNL/spack)
5+
[![Coverage Status](https://coveralls.io/repos/github/LLNL/spack/badge.svg?branch=develop)](https://coveralls.io/github/LLNL/spack?branch=develop)
56

67
Spack is a package management tool designed to support multiple
78
versions and configurations of software on a wide variety of platforms
@@ -62,6 +63,11 @@ a [pull request](https://help.github.com/articles/using-pull-requests/).
6263
When you send your request, make ``develop`` the destination branch on the
6364
[Spack repository](https://github.com/LLNL/spack).
6465

66+
Your contribution will need to pass all the tests run by the `spack test`
67+
command, as well as the formatting checks in `share/spack/qa/run-flake8`.
68+
You should run both of these before submitting your pull request, to
69+
ensure that the online checks succeed.
70+
6571
Spack is using a rough approximation of the [Git
6672
Flow](http://nvie.com/posts/a-successful-git-branching-model/)
6773
branching model. The ``develop`` branch contains the latest

‎bin/sbang‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
#!/bin/bash
2+
##############################################################################
3+
# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
4+
# Produced at the Lawrence Livermore National Laboratory.
5+
#
6+
# This file is part of Spack.
7+
# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
8+
# LLNL-CODE-647188
9+
#
10+
# For details, see https://github.com/llnl/spack
11+
# Please also see the LICENSE file for our notice and the LGPL.
12+
#
13+
# This program is free software; you can redistribute it and/or modify
14+
# it under the terms of the GNU Lesser General Public License (as
15+
# published by the Free Software Foundation) version 2.1, February 1999.
16+
#
17+
# This program is distributed in the hope that it will be useful, but
18+
# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
19+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
20+
# conditions of the GNU Lesser General Public License for more details.
21+
#
22+
# You should have received a copy of the GNU Lesser General Public
23+
# License along with this program; if not, write to the Free Software
24+
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
25+
##############################################################################
226
#
327
# `sbang`: Run scripts with long shebang lines.
428
#

‎bin/spack‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
#!/usr/bin/env python
22
##############################################################################
3-
# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
3+
# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
44
# Produced at the Lawrence Livermore National Laboratory.
55
#
66
# This file is part of Spack.
7-
# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
7+
# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
88
# LLNL-CODE-647188
99
#
1010
# For details, see https://github.com/llnl/spack
1111
# Please also see the LICENSE file for our notice and the LGPL.
1212
#
1313
# This program is free software; you can redistribute it and/or modify
14-
# it under the terms of the GNU General Public License (as published by
15-
# the Free Software Foundation) version 2.1 dated February 1999.
14+
# it under the terms of the GNU Lesser General Public License (as
15+
# published by the Free Software Foundation) version 2.1, February 1999.
1616
#
1717
# This program is distributed in the hope that it will be useful, but
1818
# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
1919
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
20-
# conditions of the GNU General Public License for more details.
20+
# conditions of the GNU Lesser General Public License for more details.
2121
#
22-
# You should have received a copy of the GNU Lesser General Public License
23-
# along with this program; if not, write to the Free Software Foundation,
24-
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22+
# You should have received a copy of the GNU Lesser General Public
23+
# License along with this program; if not, write to the Free Software
24+
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2525
##############################################################################
2626
import sys
2727
if not sys.version_info[:2] >= (2,6):
@@ -152,7 +152,7 @@ def main():
152152
command = spack.cmd.get_command(args.command)
153153
try:
154154
return_val = command(parser, args)
155-
except SpackError, e:
155+
except SpackError as e:
156156
e.die()
157157
except KeyboardInterrupt:
158158
sys.stderr.write('\n')

‎bin/spack-python‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
#!/bin/sh
22
##############################################################################
3-
# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
3+
# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
44
# Produced at the Lawrence Livermore National Laboratory.
55
#
66
# This file is part of Spack.
7-
# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
7+
# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
88
# LLNL-CODE-647188
99
#
1010
# For details, see https://github.com/llnl/spack
1111
# Please also see the LICENSE file for our notice and the LGPL.
1212
#
1313
# This program is free software; you can redistribute it and/or modify
14-
# it under the terms of the GNU General Public License (as published by
15-
# the Free Software Foundation) version 2.1 dated February 1999.
14+
# it under the terms of the GNU Lesser General Public License (as
15+
# published by the Free Software Foundation) version 2.1, February 1999.
1616
#
1717
# This program is distributed in the hope that it will be useful, but
1818
# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
1919
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
20-
# conditions of the GNU General Public License for more details.
20+
# conditions of the GNU Lesser General Public License for more details.
2121
#
22-
# You should have received a copy of the GNU Lesser General Public License
23-
# along with this program; if not, write to the Free Software Foundation,
24-
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22+
# You should have received a copy of the GNU Lesser General Public
23+
# License along with this program; if not, write to the Free Software
24+
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2525
##############################################################################
2626
#
2727
# spack-python

‎etc/spack/modules.yaml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,25 @@
55
# although users can override these settings in their ~/.spack/modules.yaml.
66
# -------------------------------------------------------------------------
77
modules:
8-
enable: ['tcl', 'dotkit']
8+
enable:
9+
- tcl
10+
- dotkit
11+
prefix_inspections:
12+
bin:
13+
- PATH
14+
man:
15+
- MANPATH
16+
lib:
17+
- LIBRARY_PATH
18+
- LD_LIBRARY_PATH
19+
lib64:
20+
- LIBRARY_PATH
21+
- LD_LIBRARY_PATH
22+
include:
23+
- CPATH
24+
lib/pkgconfig:
25+
- PKGCONFIG
26+
lib64/pkgconfig:
27+
- PKGCONFIG
28+
'':
29+
- CMAKE_PREFIX_PATH

0 commit comments

Comments
 (0)