From b652fe72d7a55150813c6ffbb68e9c724737fc0a Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 2 Nov 2022 22:24:59 +0100 Subject: remove `deptype_query` remnants and fix incorrect `deptypes` kwarg (#33670) * 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. --- var/spack/repos/builtin/packages/lua/package.py | 2 +- var/spack/repos/builtin/packages/perl/package.py | 8 ++++---- var/spack/repos/builtin/packages/r/package.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py index 4894ab2b91..d04d2036d3 100644 --- a/var/spack/repos/builtin/packages/lua/package.py +++ b/var/spack/repos/builtin/packages/lua/package.py @@ -115,7 +115,7 @@ class LuaImplPackage(MakefilePackage): 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)) diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index d7b32543fd..b268c86f2b 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -355,12 +355,12 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package 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 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package 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. diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index ffae98f8ef..af5d740b12 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -198,7 +198,7 @@ class R(AutotoolsPackage): # 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)) -- cgit v1.2.3-70-g09d2