2021-07-06 23:48:15 +02:00
|
|
|
From: Egbert Eich <eich@suse.com>
|
2022-04-09 11:35:39 +02:00
|
|
|
Date: Thu Apr 7 20:25:46 2022 +0200
|
2021-07-06 23:48:15 +02:00
|
|
|
Subject: Fix error during documentation build due to recursive module inclusion
|
|
|
|
|
Patch-mainline: Not yet
|
2022-04-09 11:35:39 +02:00
|
|
|
Git-commit: 7000c074119ebc3354b18a3b2aa27d431f906840
|
2021-07-06 23:48:15 +02:00
|
|
|
References:
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
Accepting request 931785 from home:mslacken:sp
- updated to version 0.17.0
(Upstream feature/bug references (<ID>) are relative to
https://github.com/spack/spack/issues/<ID>).
* New concretizer is now default
The new concretizer introduced as an experimental feature in v0.16.0
is now the default (#25502). The new concretizer is based on the
clingo logic programming system,
and it enables us to do much higher quality and faster dependency solving
The old concretizer is still available via the concretizer: original
setting, but it is deprecated and will be removed in v0.18.0.
* Binary Bootstrapping
To make it easier to use the new concretizer and binary packages,
Spack now bootstraps clingo and GnuPG from public binaries. If it
is not able to bootstrap them from binaries, it installs them from
source code. With these changes, you should still be able to clone Spack
and start using it almost immediately.
* Reuse existing packages (experimental)
The most wanted feature from our
2020 user survey and
the most wanted Spack feature of all time (#25310). spack install,
spack spec, and spack concretize now have a --reuse option, which
causes Spack to minimize the number of rebuilds it does. The --reuse
option will try to find existing installations and binary packages locally
and in registered mirrors, and will prefer to use them over building new
versions. This will allow users to build from source far less than in
prior versions of Spack. This feature will continue to be improved, with
configuration options and better CLI expected in v0.17.1. It will become
the default concretization mode in v0.18.0.
* Better error messages
We have improved the error messages generated by the new concretizer by
OBS-URL: https://build.opensuse.org/request/show/931785
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=35
2021-11-16 15:32:55 +01:00
|
|
|
Signed-off-by: Egbert Eich <eich@suse.de>
|
2021-07-06 23:48:15 +02:00
|
|
|
---
|
2022-04-09 11:35:39 +02:00
|
|
|
lib/spack/spack/cmd/__init__.py | 5 ++++-
|
|
|
|
|
lib/spack/spack/environment/environment.py | 5 ++++-
|
|
|
|
|
lib/spack/spack/installer.py | 5 ++++-
|
|
|
|
|
lib/spack/spack/main.py | 5 ++++-
|
|
|
|
|
4 files changed, 16 insertions(+), 4 deletions(-)
|
|
|
|
|
diff --git a/lib/spack/spack/cmd/__init__.py b/lib/spack/spack/cmd/__init__.py
|
|
|
|
|
index 0b0451c..cbedb9a 100644
|
|
|
|
|
--- a/lib/spack/spack/cmd/__init__.py
|
|
|
|
|
+++ b/lib/spack/spack/cmd/__init__.py
|
|
|
|
|
@@ -21,7 +21,10 @@
|
|
|
|
|
from llnl.util.tty.color import colorize
|
|
|
|
|
|
2021-07-07 18:05:08 +02:00
|
|
|
import spack.config
|
2022-04-09 11:35:39 +02:00
|
|
|
-import spack.environment as ev
|
|
|
|
|
+try:
|
|
|
|
|
+ import spack.environment as ev
|
|
|
|
|
+except AttributeError:
|
|
|
|
|
+ pass
|
|
|
|
|
import spack.error
|
|
|
|
|
import spack.extensions
|
Accepting request 931785 from home:mslacken:sp
- updated to version 0.17.0
(Upstream feature/bug references (<ID>) are relative to
https://github.com/spack/spack/issues/<ID>).
* New concretizer is now default
The new concretizer introduced as an experimental feature in v0.16.0
is now the default (#25502). The new concretizer is based on the
clingo logic programming system,
and it enables us to do much higher quality and faster dependency solving
The old concretizer is still available via the concretizer: original
setting, but it is deprecated and will be removed in v0.18.0.
* Binary Bootstrapping
To make it easier to use the new concretizer and binary packages,
Spack now bootstraps clingo and GnuPG from public binaries. If it
is not able to bootstrap them from binaries, it installs them from
source code. With these changes, you should still be able to clone Spack
and start using it almost immediately.
* Reuse existing packages (experimental)
The most wanted feature from our
2020 user survey and
the most wanted Spack feature of all time (#25310). spack install,
spack spec, and spack concretize now have a --reuse option, which
causes Spack to minimize the number of rebuilds it does. The --reuse
option will try to find existing installations and binary packages locally
and in registered mirrors, and will prefer to use them over building new
versions. This will allow users to build from source far less than in
prior versions of Spack. This feature will continue to be improved, with
configuration options and better CLI expected in v0.17.1. It will become
the default concretization mode in v0.18.0.
* Better error messages
We have improved the error messages generated by the new concretizer by
OBS-URL: https://build.opensuse.org/request/show/931785
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=35
2021-11-16 15:32:55 +01:00
|
|
|
import spack.paths
|
|
|
|
|
diff --git a/lib/spack/spack/environment/environment.py b/lib/spack/spack/environment/environment.py
|
2022-04-09 11:35:39 +02:00
|
|
|
index 3114f55..059b057 100644
|
Accepting request 931785 from home:mslacken:sp
- updated to version 0.17.0
(Upstream feature/bug references (<ID>) are relative to
https://github.com/spack/spack/issues/<ID>).
* New concretizer is now default
The new concretizer introduced as an experimental feature in v0.16.0
is now the default (#25502). The new concretizer is based on the
clingo logic programming system,
and it enables us to do much higher quality and faster dependency solving
The old concretizer is still available via the concretizer: original
setting, but it is deprecated and will be removed in v0.18.0.
* Binary Bootstrapping
To make it easier to use the new concretizer and binary packages,
Spack now bootstraps clingo and GnuPG from public binaries. If it
is not able to bootstrap them from binaries, it installs them from
source code. With these changes, you should still be able to clone Spack
and start using it almost immediately.
* Reuse existing packages (experimental)
The most wanted feature from our
2020 user survey and
the most wanted Spack feature of all time (#25310). spack install,
spack spec, and spack concretize now have a --reuse option, which
causes Spack to minimize the number of rebuilds it does. The --reuse
option will try to find existing installations and binary packages locally
and in registered mirrors, and will prefer to use them over building new
versions. This will allow users to build from source far less than in
prior versions of Spack. This feature will continue to be improved, with
configuration options and better CLI expected in v0.17.1. It will become
the default concretization mode in v0.18.0.
* Better error messages
We have improved the error messages generated by the new concretizer by
OBS-URL: https://build.opensuse.org/request/show/931785
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=35
2021-11-16 15:32:55 +01:00
|
|
|
--- a/lib/spack/spack/environment/environment.py
|
|
|
|
|
+++ b/lib/spack/spack/environment/environment.py
|
2022-04-09 11:35:39 +02:00
|
|
|
@@ -32,7 +32,10 @@
|
Accepting request 931785 from home:mslacken:sp
- updated to version 0.17.0
(Upstream feature/bug references (<ID>) are relative to
https://github.com/spack/spack/issues/<ID>).
* New concretizer is now default
The new concretizer introduced as an experimental feature in v0.16.0
is now the default (#25502). The new concretizer is based on the
clingo logic programming system,
and it enables us to do much higher quality and faster dependency solving
The old concretizer is still available via the concretizer: original
setting, but it is deprecated and will be removed in v0.18.0.
* Binary Bootstrapping
To make it easier to use the new concretizer and binary packages,
Spack now bootstraps clingo and GnuPG from public binaries. If it
is not able to bootstrap them from binaries, it installs them from
source code. With these changes, you should still be able to clone Spack
and start using it almost immediately.
* Reuse existing packages (experimental)
The most wanted feature from our
2020 user survey and
the most wanted Spack feature of all time (#25310). spack install,
spack spec, and spack concretize now have a --reuse option, which
causes Spack to minimize the number of rebuilds it does. The --reuse
option will try to find existing installations and binary packages locally
and in registered mirrors, and will prefer to use them over building new
versions. This will allow users to build from source far less than in
prior versions of Spack. This feature will continue to be improved, with
configuration options and better CLI expected in v0.17.1. It will become
the default concretization mode in v0.18.0.
* Better error messages
We have improved the error messages generated by the new concretizer by
OBS-URL: https://build.opensuse.org/request/show/931785
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=35
2021-11-16 15:32:55 +01:00
|
|
|
import spack.stage
|
|
|
|
|
import spack.store
|
|
|
|
|
import spack.subprocess_context
|
2021-07-07 18:05:08 +02:00
|
|
|
-import spack.user_environment as uenv
|
2022-04-09 11:35:39 +02:00
|
|
|
+try:
|
2021-07-07 18:05:08 +02:00
|
|
|
+ import spack.user_environment as uenv
|
2022-04-09 11:35:39 +02:00
|
|
|
+except AttributeError:
|
|
|
|
|
+ pass
|
Accepting request 931785 from home:mslacken:sp
- updated to version 0.17.0
(Upstream feature/bug references (<ID>) are relative to
https://github.com/spack/spack/issues/<ID>).
* New concretizer is now default
The new concretizer introduced as an experimental feature in v0.16.0
is now the default (#25502). The new concretizer is based on the
clingo logic programming system,
and it enables us to do much higher quality and faster dependency solving
The old concretizer is still available via the concretizer: original
setting, but it is deprecated and will be removed in v0.18.0.
* Binary Bootstrapping
To make it easier to use the new concretizer and binary packages,
Spack now bootstraps clingo and GnuPG from public binaries. If it
is not able to bootstrap them from binaries, it installs them from
source code. With these changes, you should still be able to clone Spack
and start using it almost immediately.
* Reuse existing packages (experimental)
The most wanted feature from our
2020 user survey and
the most wanted Spack feature of all time (#25310). spack install,
spack spec, and spack concretize now have a --reuse option, which
causes Spack to minimize the number of rebuilds it does. The --reuse
option will try to find existing installations and binary packages locally
and in registered mirrors, and will prefer to use them over building new
versions. This will allow users to build from source far less than in
prior versions of Spack. This feature will continue to be improved, with
configuration options and better CLI expected in v0.17.1. It will become
the default concretization mode in v0.18.0.
* Better error messages
We have improved the error messages generated by the new concretizer by
OBS-URL: https://build.opensuse.org/request/show/931785
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=35
2021-11-16 15:32:55 +01:00
|
|
|
import spack.util.cpus
|
2021-07-07 18:05:08 +02:00
|
|
|
import spack.util.environment
|
Accepting request 931785 from home:mslacken:sp
- updated to version 0.17.0
(Upstream feature/bug references (<ID>) are relative to
https://github.com/spack/spack/issues/<ID>).
* New concretizer is now default
The new concretizer introduced as an experimental feature in v0.16.0
is now the default (#25502). The new concretizer is based on the
clingo logic programming system,
and it enables us to do much higher quality and faster dependency solving
The old concretizer is still available via the concretizer: original
setting, but it is deprecated and will be removed in v0.18.0.
* Binary Bootstrapping
To make it easier to use the new concretizer and binary packages,
Spack now bootstraps clingo and GnuPG from public binaries. If it
is not able to bootstrap them from binaries, it installs them from
source code. With these changes, you should still be able to clone Spack
and start using it almost immediately.
* Reuse existing packages (experimental)
The most wanted feature from our
2020 user survey and
the most wanted Spack feature of all time (#25310). spack install,
spack spec, and spack concretize now have a --reuse option, which
causes Spack to minimize the number of rebuilds it does. The --reuse
option will try to find existing installations and binary packages locally
and in registered mirrors, and will prefer to use them over building new
versions. This will allow users to build from source far less than in
prior versions of Spack. This feature will continue to be improved, with
configuration options and better CLI expected in v0.17.1. It will become
the default concretization mode in v0.18.0.
* Better error messages
We have improved the error messages generated by the new concretizer by
OBS-URL: https://build.opensuse.org/request/show/931785
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=35
2021-11-16 15:32:55 +01:00
|
|
|
import spack.util.hash
|
2022-04-09 11:35:39 +02:00
|
|
|
diff --git a/lib/spack/spack/installer.py b/lib/spack/spack/installer.py
|
|
|
|
|
index df1d704..ef0bda2 100644
|
|
|
|
|
--- a/lib/spack/spack/installer.py
|
|
|
|
|
+++ b/lib/spack/spack/installer.py
|
|
|
|
|
@@ -45,7 +45,10 @@
|
|
|
|
|
from llnl.util.tty.color import colorize
|
|
|
|
|
from llnl.util.tty.log import log_output
|
|
|
|
|
|
|
|
|
|
-import spack.binary_distribution as binary_distribution
|
|
|
|
|
+try:
|
|
|
|
|
+ import spack.binary_distribution as binary_distribution
|
|
|
|
|
+except AttributeError:
|
|
|
|
|
+ pass
|
|
|
|
|
import spack.compilers
|
|
|
|
|
import spack.error
|
|
|
|
|
import spack.hooks
|
2021-07-07 18:05:08 +02:00
|
|
|
diff --git a/lib/spack/spack/main.py b/lib/spack/spack/main.py
|
2022-04-09 11:35:39 +02:00
|
|
|
index f41423f..bb6c909 100644
|
2021-07-07 18:05:08 +02:00
|
|
|
--- a/lib/spack/spack/main.py
|
|
|
|
|
+++ b/lib/spack/spack/main.py
|
2022-04-09 11:35:39 +02:00
|
|
|
@@ -36,7 +36,10 @@
|
Accepting request 931785 from home:mslacken:sp
- updated to version 0.17.0
(Upstream feature/bug references (<ID>) are relative to
https://github.com/spack/spack/issues/<ID>).
* New concretizer is now default
The new concretizer introduced as an experimental feature in v0.16.0
is now the default (#25502). The new concretizer is based on the
clingo logic programming system,
and it enables us to do much higher quality and faster dependency solving
The old concretizer is still available via the concretizer: original
setting, but it is deprecated and will be removed in v0.18.0.
* Binary Bootstrapping
To make it easier to use the new concretizer and binary packages,
Spack now bootstraps clingo and GnuPG from public binaries. If it
is not able to bootstrap them from binaries, it installs them from
source code. With these changes, you should still be able to clone Spack
and start using it almost immediately.
* Reuse existing packages (experimental)
The most wanted feature from our
2020 user survey and
the most wanted Spack feature of all time (#25310). spack install,
spack spec, and spack concretize now have a --reuse option, which
causes Spack to minimize the number of rebuilds it does. The --reuse
option will try to find existing installations and binary packages locally
and in registered mirrors, and will prefer to use them over building new
versions. This will allow users to build from source far less than in
prior versions of Spack. This feature will continue to be improved, with
configuration options and better CLI expected in v0.17.1. It will become
the default concretization mode in v0.18.0.
* Better error messages
We have improved the error messages generated by the new concretizer by
OBS-URL: https://build.opensuse.org/request/show/931785
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=35
2021-11-16 15:32:55 +01:00
|
|
|
import spack
|
2021-07-07 18:05:08 +02:00
|
|
|
import spack.cmd
|
Accepting request 931785 from home:mslacken:sp
- updated to version 0.17.0
(Upstream feature/bug references (<ID>) are relative to
https://github.com/spack/spack/issues/<ID>).
* New concretizer is now default
The new concretizer introduced as an experimental feature in v0.16.0
is now the default (#25502). The new concretizer is based on the
clingo logic programming system,
and it enables us to do much higher quality and faster dependency solving
The old concretizer is still available via the concretizer: original
setting, but it is deprecated and will be removed in v0.18.0.
* Binary Bootstrapping
To make it easier to use the new concretizer and binary packages,
Spack now bootstraps clingo and GnuPG from public binaries. If it
is not able to bootstrap them from binaries, it installs them from
source code. With these changes, you should still be able to clone Spack
and start using it almost immediately.
* Reuse existing packages (experimental)
The most wanted feature from our
2020 user survey and
the most wanted Spack feature of all time (#25310). spack install,
spack spec, and spack concretize now have a --reuse option, which
causes Spack to minimize the number of rebuilds it does. The --reuse
option will try to find existing installations and binary packages locally
and in registered mirrors, and will prefer to use them over building new
versions. This will allow users to build from source far less than in
prior versions of Spack. This feature will continue to be improved, with
configuration options and better CLI expected in v0.17.1. It will become
the default concretization mode in v0.18.0.
* Better error messages
We have improved the error messages generated by the new concretizer by
OBS-URL: https://build.opensuse.org/request/show/931785
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=35
2021-11-16 15:32:55 +01:00
|
|
|
import spack.config
|
2021-07-07 18:05:08 +02:00
|
|
|
-import spack.environment as ev
|
2022-04-09 11:35:39 +02:00
|
|
|
+try:
|
2021-07-07 18:05:08 +02:00
|
|
|
+ import spack.environment as ev
|
2022-04-09 11:35:39 +02:00
|
|
|
+except AttributeError:
|
|
|
|
|
+ pass
|
Accepting request 931785 from home:mslacken:sp
- updated to version 0.17.0
(Upstream feature/bug references (<ID>) are relative to
https://github.com/spack/spack/issues/<ID>).
* New concretizer is now default
The new concretizer introduced as an experimental feature in v0.16.0
is now the default (#25502). The new concretizer is based on the
clingo logic programming system,
and it enables us to do much higher quality and faster dependency solving
The old concretizer is still available via the concretizer: original
setting, but it is deprecated and will be removed in v0.18.0.
* Binary Bootstrapping
To make it easier to use the new concretizer and binary packages,
Spack now bootstraps clingo and GnuPG from public binaries. If it
is not able to bootstrap them from binaries, it installs them from
source code. With these changes, you should still be able to clone Spack
and start using it almost immediately.
* Reuse existing packages (experimental)
The most wanted feature from our
2020 user survey and
the most wanted Spack feature of all time (#25310). spack install,
spack spec, and spack concretize now have a --reuse option, which
causes Spack to minimize the number of rebuilds it does. The --reuse
option will try to find existing installations and binary packages locally
and in registered mirrors, and will prefer to use them over building new
versions. This will allow users to build from source far less than in
prior versions of Spack. This feature will continue to be improved, with
configuration options and better CLI expected in v0.17.1. It will become
the default concretization mode in v0.18.0.
* Better error messages
We have improved the error messages generated by the new concretizer by
OBS-URL: https://build.opensuse.org/request/show/931785
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=35
2021-11-16 15:32:55 +01:00
|
|
|
import spack.modules
|
2021-07-07 18:05:08 +02:00
|
|
|
import spack.paths
|
Accepting request 931785 from home:mslacken:sp
- updated to version 0.17.0
(Upstream feature/bug references (<ID>) are relative to
https://github.com/spack/spack/issues/<ID>).
* New concretizer is now default
The new concretizer introduced as an experimental feature in v0.16.0
is now the default (#25502). The new concretizer is based on the
clingo logic programming system,
and it enables us to do much higher quality and faster dependency solving
The old concretizer is still available via the concretizer: original
setting, but it is deprecated and will be removed in v0.18.0.
* Binary Bootstrapping
To make it easier to use the new concretizer and binary packages,
Spack now bootstraps clingo and GnuPG from public binaries. If it
is not able to bootstrap them from binaries, it installs them from
source code. With these changes, you should still be able to clone Spack
and start using it almost immediately.
* Reuse existing packages (experimental)
The most wanted feature from our
2020 user survey and
the most wanted Spack feature of all time (#25310). spack install,
spack spec, and spack concretize now have a --reuse option, which
causes Spack to minimize the number of rebuilds it does. The --reuse
option will try to find existing installations and binary packages locally
and in registered mirrors, and will prefer to use them over building new
versions. This will allow users to build from source far less than in
prior versions of Spack. This feature will continue to be improved, with
configuration options and better CLI expected in v0.17.1. It will become
the default concretization mode in v0.18.0.
* Better error messages
We have improved the error messages generated by the new concretizer by
OBS-URL: https://build.opensuse.org/request/show/931785
OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=35
2021-11-16 15:32:55 +01:00
|
|
|
import spack.platforms
|
