zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove deptype_query remnants and fix incorrect deptypes kwarg (#33670)

Browse Source 
* remove deptype_query remnants
* deptypes -> deptype

These arguments haven't existed since 2017, but `traverse` now fails on unknown **kwargs, so they have finally popped up.
This commit is contained in:
Harmen Stoppels 2022-11-02 22:24:59 +01:00 committed by GitHub
parent 4d5f2e3a37
commit b652fe72d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/spack/build_systems/lua.py
View File

@ -76,7 +76,7 @@ def _generate_tree_line(name, prefix):
def generate_luarocks_config(self, pkg, spec, prefix):
spec = self.pkg.spec
table_entries = []
for d in spec.traverse(deptypes=("build", "run"), deptype_query="run"):
for d in spec.traverse(deptype=("build", "run")):
if d.package.extends(self.pkg.extendee_spec):
table_entries.append(self._generate_tree_line(d.name, d.prefix))

2
var/spack/repos/builtin/packages/lua/package.py
View File

@ -115,7 +115,7 @@ def append_paths(self, paths, cpaths, path):
def _setup_dependent_env_helper(self, env, dependent_spec):
lua_paths = []
for d in dependent_spec.traverse(deptypes=("build", "run"), deptype_query="run"):
for d in dependent_spec.traverse(deptype=("build", "run")):
if d.package.extends(self.spec):
lua_paths.append(os.path.join(d.prefix, self.lua_lib_dir))
lua_paths.append(os.path.join(d.prefix, self.lua_lib64_dir))

8
var/spack/repos/builtin/packages/perl/package.py
View File

@ -355,12 +355,12 @@ def install_cpanm(self):
maker()
maker("install")
def _setup_dependent_env(self, env, dependent_spec, deptypes):
def _setup_dependent_env(self, env, dependent_spec, deptype):
"""Set PATH and PERL5LIB to include the extension and
any other perl extensions it depends on,
assuming they were installed with INSTALL_BASE defined."""
perl_lib_dirs = []
for d in dependent_spec.traverse(deptype=deptypes):
for d in dependent_spec.traverse(deptype=deptype):
if d.package.extends(self.spec):
perl_lib_dirs.append(d.prefix.lib.perl5)
if perl_lib_dirs:
@ -370,10 +370,10 @@ def _setup_dependent_env(self, env, dependent_spec, deptypes):
env.append_path("PATH", self.prefix.bin)
def setup_dependent_build_environment(self, env, dependent_spec):
self._setup_dependent_env(env, dependent_spec, deptypes=("build", "run", "test"))
self._setup_dependent_env(env, dependent_spec, deptype=("build", "run", "test"))
def setup_dependent_run_environment(self, env, dependent_spec):
self._setup_dependent_env(env, dependent_spec, deptypes=("run",))
self._setup_dependent_env(env, dependent_spec, deptype=("run",))
def setup_dependent_package(self, module, dependent_spec):
"""Called before perl modules' install() methods.

2
var/spack/repos/builtin/packages/r/package.py
View File

@ -198,7 +198,7 @@ def setup_dependent_build_environment(self, env, dependent_spec):
# Set R_LIBS to include the library dir for the
# extension and any other R extensions it depends on.
r_libs_path = []
for d in dependent_spec.traverse(deptype=("build", "run"), deptype_query="run"):
for d in dependent_spec.traverse(deptype=("build", "run")):
if d.package.extends(self.spec):
r_libs_path.append(join_path(d.prefix, self.r_lib_dir))