From 2927e708bc1a73cbc9ef431fc9a3b570d694c5f3 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 21 May 2025 00:27:35 +0200 Subject: [PATCH] PackageBase: make _update_external_dependencies private (#50580) --- lib/spack/spack/package_base.py | 4 +++- lib/spack/spack/solver/asp.py | 2 +- var/spack/repos/spack_repo/builtin/build_systems/python.py | 2 +- .../spack_repo/builtin_mock/build_systems/python.py | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/spack/spack/package_base.py b/lib/spack/spack/package_base.py index bf2b51cb3e3..4584bd14d5d 100644 --- a/lib/spack/spack/package_base.py +++ b/lib/spack/spack/package_base.py @@ -986,7 +986,9 @@ def url_for_version(self, version): """ return self._implement_all_urls_for_version(version)[0] - def update_external_dependencies(self, extendee_spec=None): + def _update_external_dependencies( + self, extendee_spec: Optional[spack.spec.Spec] = None + ) -> None: """ Method to override in package classes to handle external dependencies """ diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py index 9c3b31e2357..a9ff0d8d3e5 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -3894,7 +3894,7 @@ def external_spec_selected(self, node, idx): if extendee_spec: extendee_node = SpecBuilder.make_node(pkg=extendee_spec.name) - package.update_external_dependencies(self._specs.get(extendee_node, None)) + package._update_external_dependencies(self._specs.get(extendee_node)) def depends_on(self, parent_node, dependency_node, type): dependency_spec = self._specs[dependency_node] diff --git a/var/spack/repos/spack_repo/builtin/build_systems/python.py b/var/spack/repos/spack_repo/builtin/build_systems/python.py index e1bad681383..79bfa6e59c9 100644 --- a/var/spack/repos/spack_repo/builtin/build_systems/python.py +++ b/var/spack/repos/spack_repo/builtin/build_systems/python.py @@ -250,7 +250,7 @@ def test_imports(self) -> None: ): python("-c", f"import {module}") - def update_external_dependencies(self, extendee_spec=None): + def _update_external_dependencies(self, extendee_spec: Optional[Spec] = None) -> None: """ Ensure all external python packages have a python dependency diff --git a/var/spack/test_repos/spack_repo/builtin_mock/build_systems/python.py b/var/spack/test_repos/spack_repo/builtin_mock/build_systems/python.py index 974e259e07b..a3bde3be19a 100644 --- a/var/spack/test_repos/spack_repo/builtin_mock/build_systems/python.py +++ b/var/spack/test_repos/spack_repo/builtin_mock/build_systems/python.py @@ -240,7 +240,7 @@ def test_imports(self) -> None: ): python("-c", f"import {module}") - def update_external_dependencies(self, extendee_spec=None): + def _update_external_dependencies(self, extendee_spec=None): """ Ensure all external python packages have a python dependency