hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bugfix: template create constructor args (#12536)

Browse source 
c9e214f updated template creation by passing **kwargs to package
template classes but the template classes were not updated to accept
them; this adds **kwargs to package template initializers where they
are needed.
This commit is contained in:
Tamara Dahlgren 2019-08-23 10:45:17 -07:00 committed by Peter Scheibel
parent f199b2d42e
commit b42324c23b
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/spack/spack/cmd/create.py
View file

@ -251,14 +251,14 @@ def build_args(self, spec, prefix):
args = []
return args"""
def __init__(self, name, *args):
def __init__(self, name, *args, **kwargs):
# If the user provided `--name py-numpy`, don't rename it py-py-numpy
if not name.startswith('py-'):
# Make it more obvious that we are renaming the package
tty.msg("Changing package name from {0} to py-{0}".format(name))
name = 'py-{0}'.format(name)
super(PythonPackageTemplate, self).__init__(name, *args)
super(PythonPackageTemplate, self).__init__(name, *args, **kwargs)
class RPackageTemplate(PackageTemplate):
@ -276,14 +276,14 @@ def configure_args(self, spec, prefix):
args = []
return args"""
def __init__(self, name, *args):
def __init__(self, name, *args, **kwargs):
# If the user provided `--name r-rcpp`, don't rename it r-r-rcpp
if not name.startswith('r-'):
# Make it more obvious that we are renaming the package
tty.msg("Changing package name from {0} to r-{0}".format(name))
name = 'r-{0}'.format(name)
super(RPackageTemplate, self).__init__(name, *args)
super(RPackageTemplate, self).__init__(name, *args, **kwargs)
class PerlmakePackageTemplate(PackageTemplate):
@ -302,14 +302,14 @@ def configure_args(self):
args = []
return args"""
def __init__(self, name, *args):
def __init__(self, name, *args, **kwargs):
# If the user provided `--name perl-cpp`, don't rename it perl-perl-cpp
if not name.startswith('perl-'):
# Make it more obvious that we are renaming the package
tty.msg("Changing package name from {0} to perl-{0}".format(name))
name = 'perl-{0}'.format(name)
super(PerlmakePackageTemplate, self).__init__(name, *args)
super(PerlmakePackageTemplate, self).__init__(name, *args, **kwargs)
class PerlbuildPackageTemplate(PerlmakePackageTemplate):
@ -333,7 +333,7 @@ class OctavePackageTemplate(PackageTemplate):
# FIXME: Add additional dependencies if required.
# depends_on('octave-foo', type=('build', 'run'))"""
def __init__(self, name, *args):
def __init__(self, name, *args, **kwargs):
# If the user provided `--name octave-splines`, don't rename it
# octave-octave-splines
if not name.startswith('octave-'):
@ -341,7 +341,7 @@ def __init__(self, name, *args):
tty.msg("Changing package name from {0} to octave-{0}".format(name)) # noqa
name = 'octave-{0}'.format(name)
super(OctavePackageTemplate, self).__init__(name, *args)
super(OctavePackageTemplate, self).__init__(name, *args, **kwargs)
class MakefilePackageTemplate(PackageTemplate):
@ -378,14 +378,14 @@ def configure_args(self, spec, prefix):
args = []
return args"""
def __init__(self, name, *args):
def __init__(self, name, *args, **kwargs):
# If the user provided `--name py-pyqt4`, don't rename it py-py-pyqt4
if not name.startswith('py-'):
# Make it more obvious that we are renaming the package
tty.msg("Changing package name from {0} to py-{0}".format(name))
name = 'py-{0}'.format(name)
super(SIPPackageTemplate, self).__init__(name, *args)
super(SIPPackageTemplate, self).__init__(name, *args, **kwargs)
templates = {