From e72b69732eca35dbd4ccaae15b1307eff0a8d538 Mon Sep 17 00:00:00 2001 From: alalazo Date: Thu, 3 Aug 2017 17:21:40 +0200 Subject: [PATCH] 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(-) 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 @@ def libs(self): 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 @@ def libs(self): 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 @@ def url_for_version(self, version): 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 @@ def libs(self): 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 @@ def mpi_libs(self): 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 @@ 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, 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 @@ def libs(self): 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 @@ def install(self, spec, prefix): @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 @@ def libs(self): 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 @@ def blas_libs(self): 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 @@ def lapack_libs(self): 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 @@ def scalapack_libs(self): # 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 @@ def libs(self): 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 @@ def setup_environment(self, spack_env, run_env): # 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 @@ def setup_environment(self, spack_env, run_env): # 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 @@ def libs(self): 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):