spack/Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch
Egbert Eich 14bef5becf Accepting request 1123507 from home:bmwiedemann:branches:network:cluster
Update to version 0.20.3 with the following changes:
  * Bug fixes:
    + Fix a bug where spack mirror set-url would drop configured connection info
    + Fix a minor issue with package hash computation for Python 3.12
    + Improve escaping in Tcl module files
    + Make repo cache work on repositories with zero mtime
    + Ignore errors for newer, incompatible buildcache version
    + Print an error when git is required, but missing
    + Ensure missing build dependencies get installed when using spack install --overwrite
    + Fix an issue where Spack freezes when the build process unexpectedly exits
    + Fix a bug where installation failures cause an unrelated NameError to be thrown
    + Fix an issue where Spack package versions would be incorrectly derived from git tags
    + Fix a bug triggered when file locking fails internally
    + Prevent "spack external find" to error out when a directory cannot be accessed
    + Fix multiple performance regressions in environments
    + Add more ignored modules to pyproject.toml for mypy
  * Features:
    + Spack now supports Python 3.12

rebased Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch

OBS-URL: https://build.opensuse.org/request/show/1123507
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=86
2023-11-07 17:15:00 +00:00

28 lines
956 B
Diff

From c24349cb54442da8e49fd40a299453e56b404a90 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Thu, 7 Apr 2022 20:25:46 +0200
Subject: [PATCH] Fix error during documentation build due to recursive module
inclusion
Signed-off-by: Egbert Eich <eich@suse.com>
Signed-off-by: Egbert Eich <eich@suse.de>
---
lib/spack/spack/environment/environment.py | 4 ++++
1 file changed, 4 insertions(+)
Index: spack-0.20.3/lib/spack/spack/environment/environment.py
===================================================================
--- spack-0.20.3.orig/lib/spack/spack/environment/environment.py
+++ spack-0.20.3/lib/spack/spack/environment/environment.py
@@ -40,6 +40,10 @@ import spack.stage
import spack.store
import spack.subprocess_context
import spack.user_environment as uenv
+try:
+ import spack.user_environment as uenv
+except AttributeError:
+ pass
import spack.util.cpus
import spack.util.environment
import spack.util.hash