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

31 lines
931 B
Diff
Raw Normal View History

Accepting request 1037625 from home:mslacken:sp - updated to version 0.19.0 with follwoinig changes: * Spack's traditional package preferences are soft, but we've added hard requriements to packages.yaml and spack.yaml * spack install in an environment will no longer add to the specs: list; you'll need to either use spack add <spec> or spack install --add <spec>. * spack uninstall will not remove from your environment's specs: list; you'll need to use spack remove or spack uninstall --remove. * concretizer:unify:true is now the default mode for new environments * include environment configuration from URLs * An increasing number of packages in the ecosystem need the ability to support multiple build systems * package ++variant: enabled variant that will be propagated to dependencies * git. prefix to specify git tags or branches as versions. All of these are valid git versions in * spack ci generate --tests will generate a .gitlab-ci.yml file that not only does builds but also runs tests for built packages * spack test run --explicit will only run tests for packages that are explicitly installed, instead of all packages. * You can add a new shared_linking option to config.yaml to make Spack embed absolute paths to needed shared libraries in ELF executables and shared libraries on Linux * spack spec prints dependencies more legibly. Dependencies in the output now appear at the earliest level of indentation possible (#33406) * You can override package.py attributes like url, directly in packages.yaml * There are a number of new architecture-related format strings you can use in Spack configuration files to specify paths - Improvement from v0.18.0 * spack install --reuse was introduced in v0.17.0, and --reuse is now the default concretization mode. Spack will try hard to resolve dependencies using installed packages or binaries OBS-URL: https://build.opensuse.org/request/show/1037625 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=49
2022-11-24 08:38:21 +01:00
From dc83f5aa199bd7a393f32f53611e069d7475ccfc Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Accepting request 1037625 from home:mslacken:sp - updated to version 0.19.0 with follwoinig changes: * Spack's traditional package preferences are soft, but we've added hard requriements to packages.yaml and spack.yaml * spack install in an environment will no longer add to the specs: list; you'll need to either use spack add <spec> or spack install --add <spec>. * spack uninstall will not remove from your environment's specs: list; you'll need to use spack remove or spack uninstall --remove. * concretizer:unify:true is now the default mode for new environments * include environment configuration from URLs * An increasing number of packages in the ecosystem need the ability to support multiple build systems * package ++variant: enabled variant that will be propagated to dependencies * git. prefix to specify git tags or branches as versions. All of these are valid git versions in * spack ci generate --tests will generate a .gitlab-ci.yml file that not only does builds but also runs tests for built packages * spack test run --explicit will only run tests for packages that are explicitly installed, instead of all packages. * You can add a new shared_linking option to config.yaml to make Spack embed absolute paths to needed shared libraries in ELF executables and shared libraries on Linux * spack spec prints dependencies more legibly. Dependencies in the output now appear at the earliest level of indentation possible (#33406) * You can override package.py attributes like url, directly in packages.yaml * There are a number of new architecture-related format strings you can use in Spack configuration files to specify paths - Improvement from v0.18.0 * spack install --reuse was introduced in v0.17.0, and --reuse is now the default concretization mode. Spack will try hard to resolve dependencies using installed packages or binaries OBS-URL: https://build.opensuse.org/request/show/1037625 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=49
2022-11-24 08:38:21 +01:00
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>
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>
---
Accepting request 1037625 from home:mslacken:sp - updated to version 0.19.0 with follwoinig changes: * Spack's traditional package preferences are soft, but we've added hard requriements to packages.yaml and spack.yaml * spack install in an environment will no longer add to the specs: list; you'll need to either use spack add <spec> or spack install --add <spec>. * spack uninstall will not remove from your environment's specs: list; you'll need to use spack remove or spack uninstall --remove. * concretizer:unify:true is now the default mode for new environments * include environment configuration from URLs * An increasing number of packages in the ecosystem need the ability to support multiple build systems * package ++variant: enabled variant that will be propagated to dependencies * git. prefix to specify git tags or branches as versions. All of these are valid git versions in * spack ci generate --tests will generate a .gitlab-ci.yml file that not only does builds but also runs tests for built packages * spack test run --explicit will only run tests for packages that are explicitly installed, instead of all packages. * You can add a new shared_linking option to config.yaml to make Spack embed absolute paths to needed shared libraries in ELF executables and shared libraries on Linux * spack spec prints dependencies more legibly. Dependencies in the output now appear at the earliest level of indentation possible (#33406) * You can override package.py attributes like url, directly in packages.yaml * There are a number of new architecture-related format strings you can use in Spack configuration files to specify paths - Improvement from v0.18.0 * spack install --reuse was introduced in v0.17.0, and --reuse is now the default concretization mode. Spack will try hard to resolve dependencies using installed packages or binaries OBS-URL: https://build.opensuse.org/request/show/1037625 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=49
2022-11-24 08:38:21 +01:00
lib/spack/spack/environment/environment.py | 4 ++++
1 file changed, 4 insertions(+)
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
diff --git a/lib/spack/spack/environment/environment.py b/lib/spack/spack/environment/environment.py
Accepting request 1037625 from home:mslacken:sp - updated to version 0.19.0 with follwoinig changes: * Spack's traditional package preferences are soft, but we've added hard requriements to packages.yaml and spack.yaml * spack install in an environment will no longer add to the specs: list; you'll need to either use spack add <spec> or spack install --add <spec>. * spack uninstall will not remove from your environment's specs: list; you'll need to use spack remove or spack uninstall --remove. * concretizer:unify:true is now the default mode for new environments * include environment configuration from URLs * An increasing number of packages in the ecosystem need the ability to support multiple build systems * package ++variant: enabled variant that will be propagated to dependencies * git. prefix to specify git tags or branches as versions. All of these are valid git versions in * spack ci generate --tests will generate a .gitlab-ci.yml file that not only does builds but also runs tests for built packages * spack test run --explicit will only run tests for packages that are explicitly installed, instead of all packages. * You can add a new shared_linking option to config.yaml to make Spack embed absolute paths to needed shared libraries in ELF executables and shared libraries on Linux * spack spec prints dependencies more legibly. Dependencies in the output now appear at the earliest level of indentation possible (#33406) * You can override package.py attributes like url, directly in packages.yaml * There are a number of new architecture-related format strings you can use in Spack configuration files to specify paths - Improvement from v0.18.0 * spack install --reuse was introduced in v0.17.0, and --reuse is now the default concretization mode. Spack will try hard to resolve dependencies using installed packages or binaries OBS-URL: https://build.opensuse.org/request/show/1037625 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=49
2022-11-24 08:38:21 +01:00
index f0598e5a83..76f50ff69c 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
Accepting request 1037625 from home:mslacken:sp - updated to version 0.19.0 with follwoinig changes: * Spack's traditional package preferences are soft, but we've added hard requriements to packages.yaml and spack.yaml * spack install in an environment will no longer add to the specs: list; you'll need to either use spack add <spec> or spack install --add <spec>. * spack uninstall will not remove from your environment's specs: list; you'll need to use spack remove or spack uninstall --remove. * concretizer:unify:true is now the default mode for new environments * include environment configuration from URLs * An increasing number of packages in the ecosystem need the ability to support multiple build systems * package ++variant: enabled variant that will be propagated to dependencies * git. prefix to specify git tags or branches as versions. All of these are valid git versions in * spack ci generate --tests will generate a .gitlab-ci.yml file that not only does builds but also runs tests for built packages * spack test run --explicit will only run tests for packages that are explicitly installed, instead of all packages. * You can add a new shared_linking option to config.yaml to make Spack embed absolute paths to needed shared libraries in ELF executables and shared libraries on Linux * spack spec prints dependencies more legibly. Dependencies in the output now appear at the earliest level of indentation possible (#33406) * You can override package.py attributes like url, directly in packages.yaml * There are a number of new architecture-related format strings you can use in Spack configuration files to specify paths - Improvement from v0.18.0 * spack install --reuse was introduced in v0.17.0, and --reuse is now the default concretization mode. Spack will try hard to resolve dependencies using installed packages or binaries OBS-URL: https://build.opensuse.org/request/show/1037625 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=49
2022-11-24 08:38:21 +01:00
@@ -36,6 +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.subprocess_context
Accepting request 1037625 from home:mslacken:sp - updated to version 0.19.0 with follwoinig changes: * Spack's traditional package preferences are soft, but we've added hard requriements to packages.yaml and spack.yaml * spack install in an environment will no longer add to the specs: list; you'll need to either use spack add <spec> or spack install --add <spec>. * spack uninstall will not remove from your environment's specs: list; you'll need to use spack remove or spack uninstall --remove. * concretizer:unify:true is now the default mode for new environments * include environment configuration from URLs * An increasing number of packages in the ecosystem need the ability to support multiple build systems * package ++variant: enabled variant that will be propagated to dependencies * git. prefix to specify git tags or branches as versions. All of these are valid git versions in * spack ci generate --tests will generate a .gitlab-ci.yml file that not only does builds but also runs tests for built packages * spack test run --explicit will only run tests for packages that are explicitly installed, instead of all packages. * You can add a new shared_linking option to config.yaml to make Spack embed absolute paths to needed shared libraries in ELF executables and shared libraries on Linux * spack spec prints dependencies more legibly. Dependencies in the output now appear at the earliest level of indentation possible (#33406) * You can override package.py attributes like url, directly in packages.yaml * There are a number of new architecture-related format strings you can use in Spack configuration files to specify paths - Improvement from v0.18.0 * spack install --reuse was introduced in v0.17.0, and --reuse is now the default concretization mode. Spack will try hard to resolve dependencies using installed packages or binaries OBS-URL: https://build.opensuse.org/request/show/1037625 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=49
2022-11-24 08:38:21 +01:00
import spack.traverse
import spack.user_environment as uenv
+try:
+ import spack.user_environment as uenv
+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
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
Accepting request 1037625 from home:mslacken:sp - updated to version 0.19.0 with follwoinig changes: * Spack's traditional package preferences are soft, but we've added hard requriements to packages.yaml and spack.yaml * spack install in an environment will no longer add to the specs: list; you'll need to either use spack add <spec> or spack install --add <spec>. * spack uninstall will not remove from your environment's specs: list; you'll need to use spack remove or spack uninstall --remove. * concretizer:unify:true is now the default mode for new environments * include environment configuration from URLs * An increasing number of packages in the ecosystem need the ability to support multiple build systems * package ++variant: enabled variant that will be propagated to dependencies * git. prefix to specify git tags or branches as versions. All of these are valid git versions in * spack ci generate --tests will generate a .gitlab-ci.yml file that not only does builds but also runs tests for built packages * spack test run --explicit will only run tests for packages that are explicitly installed, instead of all packages. * You can add a new shared_linking option to config.yaml to make Spack embed absolute paths to needed shared libraries in ELF executables and shared libraries on Linux * spack spec prints dependencies more legibly. Dependencies in the output now appear at the earliest level of indentation possible (#33406) * You can override package.py attributes like url, directly in packages.yaml * There are a number of new architecture-related format strings you can use in Spack configuration files to specify paths - Improvement from v0.18.0 * spack install --reuse was introduced in v0.17.0, and --reuse is now the default concretization mode. Spack will try hard to resolve dependencies using installed packages or binaries OBS-URL: https://build.opensuse.org/request/show/1037625 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=49
2022-11-24 08:38:21 +01:00
--
2.35.3