From: Egbert Eich Date: Wed Nov 10 09:40:47 2021 +0100 Subject: Fix error during documentation build due to recursive module inclusion Patch-mainline: Not yet Git-repo: https://github.com/spack/spack Git-commit: ffc7c32398d3aad53a2f5700b6d6ddee9f0d8ef2 References: Signed-off-by: Egbert Eich Signed-off-by: Egbert Eich --- lib/spack/spack/build_environment.py | 3 ++- lib/spack/spack/environment/environment.py | 3 ++- lib/spack/spack/main.py | 3 ++- lib/spack/spack/user_environment.py | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index 83aa634276..3f32ed39cf 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -53,7 +53,8 @@ import spack.build_systems.meson import spack.config import spack.install_test -import spack.main +if not ( "spack.main" in sys.modules ): + import spack.main import spack.package import spack.paths import spack.platforms diff --git a/lib/spack/spack/environment/environment.py b/lib/spack/spack/environment/environment.py index a6be5d1c50..a8d1008c46 100644 --- a/lib/spack/spack/environment/environment.py +++ b/lib/spack/spack/environment/environment.py @@ -32,7 +32,8 @@ import spack.stage import spack.store import spack.subprocess_context -import spack.user_environment as uenv +if not ( "spack.user_environment" in sys.modules ): + import spack.user_environment as uenv import spack.util.cpus import spack.util.environment import spack.util.hash diff --git a/lib/spack/spack/main.py b/lib/spack/spack/main.py index 31a4bfe4ed..dfb2078d4f 100644 --- a/lib/spack/spack/main.py +++ b/lib/spack/spack/main.py @@ -36,7 +36,8 @@ import spack import spack.cmd import spack.config -import spack.environment as ev +if not ( "spack.environment" in sys.modules ): + import spack.environment as ev import spack.modules import spack.paths import spack.platforms diff --git a/lib/spack/spack/user_environment.py b/lib/spack/spack/user_environment.py index 55f516b732..824583d2ef 100644 --- a/lib/spack/spack/user_environment.py +++ b/lib/spack/spack/user_environment.py @@ -5,7 +5,8 @@ import os import sys -import spack.build_environment +if not ( "spack.build_environment" in sys.modules ): + import spack.build_environment import spack.config import spack.util.environment as environment import spack.util.prefix as prefix