forked from spack/spack
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Spack doesn't run site customization when started + vendor setuptools
fixes spack#9206 fixes spack#9034 A possible solution to spack#9206 is to avoid running `import site` and all the initialization procedures that this entails. This requires us to use `python -S` as an interpreter, instead of plain `python`. Of course things can't be that simple. In Linux (but not in BSD or MacOS) the shebang pass a single string argument to the interpreter. More details on the subject are here: http://sambal.org/2014/02/passing-options-node-shebang-line/ https://github.com/smikes/node/blob/minus-x-switch/doc/Minus-X-Switch-Proposal.md#shebang-interpretation but the bottom line is that this requires us to have a wrapper bash script that invokes the interpreter with the correct option. Finally, as now we are not picking up anything from the 'site', we need to vendor `setuptools` (which was still missing).
- Loading branch information
Showing
81 changed files
with
25,289 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,54 +1,2 @@ | ||
#!/usr/bin/env python | ||
############################################################################## | ||
# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. | ||
# Produced at the Lawrence Livermore National Laboratory. | ||
# | ||
# This file is part of Spack. | ||
# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. | ||
# LLNL-CODE-647188 | ||
# | ||
# For details, see https://github.com/spack/spack | ||
# Please also see the NOTICE and LICENSE files for our notice and the LGPL. | ||
# | ||
# This program is free software; you can redistribute it and/or modify | ||
# it under the terms of the GNU Lesser General Public License (as | ||
# published by the Free Software Foundation) version 2.1, February 1999. | ||
# | ||
# This program is distributed in the hope that it will be useful, but | ||
# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and | ||
# conditions of the GNU Lesser General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU Lesser General Public | ||
# License along with this program; if not, write to the Free Software | ||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
############################################################################## | ||
from __future__ import print_function | ||
|
||
import os | ||
import sys | ||
|
||
if sys.version_info[:2] < (2, 6): | ||
v_info = sys.version_info[:3] | ||
sys.exit("Spack requires Python 2.6 or higher." | ||
"This is Python %d.%d.%d." % v_info) | ||
|
||
# Find spack's location and its prefix. | ||
spack_file = os.path.realpath(os.path.expanduser(__file__)) | ||
spack_prefix = os.path.dirname(os.path.dirname(spack_file)) | ||
|
||
# Allow spack libs to be imported in our scripts | ||
spack_lib_path = os.path.join(spack_prefix, "lib", "spack") | ||
sys.path.insert(0, spack_lib_path) | ||
|
||
# Add external libs | ||
spack_external_libs = os.path.join(spack_lib_path, "external") | ||
|
||
if sys.version_info[:2] == (2, 6): | ||
sys.path.insert(0, os.path.join(spack_external_libs, 'py26')) | ||
|
||
sys.path.insert(0, spack_external_libs) | ||
|
||
# Once we've set up the system path, run the spack main method | ||
import spack.main # noqa | ||
sys.exit(spack.main.main()) | ||
#!/usr/bin/env bash | ||
exec /usr/bin/env python -S $0.py "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
#!/usr/bin/env python | ||
############################################################################## | ||
# Copyright (c) 2013-2018, Lawrence Livermore National Security, LLC. | ||
# Produced at the Lawrence Livermore National Laboratory. | ||
# | ||
# This file is part of Spack. | ||
# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. | ||
# LLNL-CODE-647188 | ||
# | ||
# For details, see https://github.com/spack/spack | ||
# Please also see the NOTICE and LICENSE files for our notice and the LGPL. | ||
# | ||
# This program is free software; you can redistribute it and/or modify | ||
# it under the terms of the GNU Lesser General Public License (as | ||
# published by the Free Software Foundation) version 2.1, February 1999. | ||
# | ||
# This program is distributed in the hope that it will be useful, but | ||
# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and | ||
# conditions of the GNU Lesser General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU Lesser General Public | ||
# License along with this program; if not, write to the Free Software | ||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
############################################################################## | ||
from __future__ import print_function | ||
|
||
import os | ||
import sys | ||
|
||
if sys.version_info[:2] < (2, 6): | ||
v_info = sys.version_info[:3] | ||
sys.exit("Spack requires Python 2.6 or higher." | ||
"This is Python %d.%d.%d." % v_info) | ||
|
||
# Find spack's location and its prefix. | ||
spack_file = os.path.realpath(os.path.expanduser(__file__)) | ||
spack_prefix = os.path.dirname(os.path.dirname(spack_file)) | ||
|
||
# Allow spack libs to be imported in our scripts | ||
spack_lib_path = os.path.join(spack_prefix, "lib", "spack") | ||
sys.path.insert(0, spack_lib_path) | ||
|
||
# Add external libs | ||
spack_external_libs = os.path.join(spack_lib_path, "external") | ||
|
||
if sys.version_info[:2] == (2, 6): | ||
sys.path.insert(0, os.path.join(spack_external_libs, 'py26')) | ||
|
||
sys.path.insert(0, spack_external_libs) | ||
|
||
# Once we've set up the system path, run the spack main method | ||
import spack.main # noqa | ||
sys.exit(spack.main.main()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
Copyright (C) 2016 Jason R Coombs <jaraco@jaraco.com> | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
this software and associated documentation files (the "Software"), to deal in | ||
the Software without restriction, including without limitation the rights to | ||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies | ||
of the Software, and to permit persons to whom the Software is furnished to do | ||
so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in all | ||
copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
SOFTWARE. |
Oops, something went wrong.