diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/py-scipy/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-scipy/package.py | 45 |
1 files changed, 12 insertions, 33 deletions
diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index 3aced0bf4a..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-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 * @@ -49,9 +30,9 @@ class PyScipy(PythonPackage): 'scipy.special._precompute' ] - # 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('1.1.0', 'aa6bcc85276b6f25e17bcfc4dede8718') + version('1.0.0', '53fa34bd3733a9a4216842b6000f7316') + 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') @@ -61,6 +42,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 @@ -68,17 +50,14 @@ 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 = [] # 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 @@ -99,5 +78,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)') |