Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Jim Galarowicz 2017-02-09 11:39:30 -08:00
commit 9ac06c99aa
4 changed files with 12 additions and 3 deletions

View File

@ -4,13 +4,17 @@ coverage:
range: 60...90 range: 60...90
status: status:
project: project:
default: true
llnl: llnl:
threshold: 0.5
paths: paths:
- lib/spack/llnl - lib/spack/llnl
commands: commands:
threshold: 0.5
paths: paths:
- lib/spack/spack/cmd - lib/spack/spack/cmd
core: core:
threshold: 0.5
paths: paths:
- "!lib/spack/llnl" - "!lib/spack/llnl"
- "!lib/spack/spack/cmd" - "!lib/spack/spack/cmd"

View File

@ -340,7 +340,6 @@ def invalid_record(hash_key, error):
# cached prematurely. # cached prematurely.
for hash_key, rec in data.items(): for hash_key, rec in data.items():
rec.spec._mark_concrete() rec.spec._mark_concrete()
rec.spec.package.spec._mark_concrete()
self._data = data self._data = data

View File

@ -30,8 +30,9 @@ class Nco(AutotoolsPackage):
netCDF-accessible formats""" netCDF-accessible formats"""
homepage = "http://nco.sourceforge.net/" homepage = "http://nco.sourceforge.net/"
url = "https://github.com/nco/nco/archive/4.6.2.tar.gz" url = "https://github.com/nco/nco/archive/4.6.4.tar.gz"
version('4.6.4', '22f4e779d0011a9c0db90fda416c8e45')
version('4.6.3', '0e1d6616c65ed3a30c54cc776da4f987') version('4.6.3', '0e1d6616c65ed3a30c54cc776da4f987')
version('4.6.2', 'b7471acf0cc100343392f4171fb56113') version('4.6.2', 'b7471acf0cc100343392f4171fb56113')
version('4.6.1', 'ef43cc989229c2790a9094bd84728fd8') version('4.6.1', 'ef43cc989229c2790a9094bd84728fd8')

View File

@ -32,7 +32,12 @@ class Parallel(AutotoolsPackage):
""" """
homepage = "http://www.gnu.org/software/parallel/" homepage = "http://www.gnu.org/software/parallel/"
url = "http://ftp.gnu.org/gnu/parallel/parallel-20160422.tar.bz2" url = "http://ftp.gnu.org/gnu/parallel/parallel-20170122.tar.bz2"
version('20170122', 'c9f0ec01463dc75dbbf292fd8be5f1eb')
version('20160422', '24621f684130472694333709bd4454cb') version('20160422', '24621f684130472694333709bd4454cb')
version('20160322', '4e81e0d36902ab4c4e969ee6f35e6e57') version('20160322', '4e81e0d36902ab4c4e969ee6f35e6e57')
def check(self):
# The Makefile has a 'test' target, but it does not work
make('check')