Skip to content

Commit d9fedc4

Browse files
gartunggartung
committed
Merge remote-tracking branch 'llnl/develop' into binary_packages
2 parents a7c0408 + 87c9b01 commit d9fedc4

File tree

180 files changed

+4940
-960
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+4940
-960
lines changed

‎.travis.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ python:
1212
- 2.7
1313

1414
env:
15-
- TEST_SUITE=unit CYAML=true
16-
- TEST_SUITE=unit CYAML=false
15+
- TEST_SUITE=unit
1716
- TEST_SUITE=flake8
1817
- TEST_SUITE=doc
1918

@@ -22,6 +21,9 @@ matrix:
2221
- python: 2.6
2322
# Flake8 no longer supports Python 2.6
2423
env: TEST_SUITE=flake8
24+
- python: 2.6
25+
# Sphinx no longer supports Python 2.6
26+
env: TEST_SUITE=doc
2527

2628
# Use new Travis infrastructure (Docker can't sudo yet)
2729
sudo: false
@@ -39,7 +41,6 @@ install:
3941
- pip install flake8
4042
- pip install sphinx
4143
- pip install mercurial
42-
- if [[ $CYAML == true ]]; then pip install --global-option "--with-libyaml" pyyaml; fi
4344

4445
before_script:
4546
# Need this for the git tests to succeed.
@@ -52,7 +53,7 @@ before_script:
5253
script: share/spack/qa/run-$TEST_SUITE-tests
5354

5455
after_success:
55-
- if [[ $TEST_SUITE == unit && $CYAML == false && $TRAVIS_PYTHON_VERSION == 2.7 ]]; then coveralls; fi
56+
- if [[ $TEST_SUITE == unit && $TRAVIS_PYTHON_VERSION == 2.7 ]]; then coveralls; fi
5657

5758
notifications:
5859
email:

‎bin/spack‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@ SPACK_PREFIX = os.path.dirname(os.path.dirname(SPACK_FILE))
4141
SPACK_LIB_PATH = os.path.join(SPACK_PREFIX, "lib", "spack")
4242
sys.path.insert(0, SPACK_LIB_PATH)
4343

44-
# Try to use system YAML if it is available, as it might have libyaml
45-
# support (for faster loading via C). Load it before anything in
46-
# lib/spack/external so it will take precedence over Spack's PyYAML.
47-
try:
48-
import yaml
49-
except ImportError:
50-
pass # ignore and use slow yaml
51-
5244
# Add external libs
5345
SPACK_EXTERNAL_LIBS = os.path.join(SPACK_LIB_PATH, "external")
5446
sys.path.insert(0, SPACK_EXTERNAL_LIBS)
@@ -128,6 +120,8 @@ parser.add_argument('-p', '--profile', action='store_true',
128120
help="Profile execution using cProfile.")
129121
parser.add_argument('-v', '--verbose', action='store_true',
130122
help="Print additional output during builds")
123+
parser.add_argument('-s', '--stacktrace', action='store_true',
124+
help="Add stacktrace information to all printed statements")
131125
parser.add_argument('-V', '--version', action='version',
132126
version="%s" % spack.spack_version)
133127

@@ -155,14 +149,15 @@ def main():
155149
# Set up environment based on args.
156150
tty.set_verbose(args.verbose)
157151
tty.set_debug(args.debug)
152+
tty.set_stacktrace(args.stacktrace)
158153
spack.debug = args.debug
159154

160155
if spack.debug:
161156
import spack.util.debug as debug
162157
debug.register_interrupt_handler()
163158

164-
from spack.yaml_version_check import check_yaml_versions
165-
check_yaml_versions()
159+
# Run any available pre-run hooks
160+
spack.hooks.pre_run()
166161

167162
spack.spack_working_dir = working_dir
168163
if args.mock:

‎etc/spack/defaults/modules.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ modules:
2424
- MANPATH
2525
share/man:
2626
- MANPATH
27+
share/aclocal:
28+
- ACLOCAL_PATH
2729
lib:
2830
- LIBRARY_PATH
2931
- LD_LIBRARY_PATH

‎lib/spack/docs/basic_usage.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,8 +838,6 @@ add a version specifier to the spec:
838838
Notice that the package versions that provide insufficient MPI
839839
versions are now filtered out.
840840

841-
.. _shell-support:
842-
843841
---------------------------
844842
Extensions & Python support
845843
---------------------------

‎lib/spack/docs/config_yaml.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _config-yaml:
22

33
====================================
4-
Basics settings
4+
Basic settings in ``config.yaml``
55
====================================
66

77
Spack's basic configuration options are set in ``config.yaml``. You can

‎lib/spack/docs/configuration.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ case you want to skip directly to specific docs:
1212
* :ref:`mirrors.yaml <mirrors>`
1313
* :ref:`modules.yaml <modules>`
1414
* :ref:`packages.yaml <build-settings>`
15+
* :ref:`repos.yaml <repositories>`
1516

1617
-------------------------
1718
YAML Format

‎lib/spack/docs/getting_started.rst‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ to your path and you're ready to go:
4747
$ export PATH=$SPACK_ROOT/bin:$PATH
4848
$ spack install libelf
4949
50-
For a richer experience, use Spack's `shell support
51-
<http://software.llnl.gov/spack/basic_usage.html#environment-modules>`_:
50+
For a richer experience, use Spack's shell support:
5251

5352
.. code-block:: console
5453
@@ -60,7 +59,9 @@ For a richer experience, use Spack's `shell support
6059
$ setenv SPACK_ROOT /path/to/spack
6160
$ source $SPACK_ROOT/share/spack/setup-env.csh
6261
63-
This automatically adds Spack to your ``PATH``.
62+
This automatically adds Spack to your ``PATH`` and allows the ``spack``
63+
command to :ref:`load environment modules <shell-support>` and execute
64+
:ref:`useful packaging commands <packaging-shell-support>`.
6465

6566
^^^^^^^^^^^^^^^^^
6667
Clean Environment

‎lib/spack/docs/index.rst‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,35 +46,30 @@ or refer to the full manual below.
4646
getting_started
4747
basic_usage
4848
workflows
49+
tutorial_sc16
4950

5051
.. toctree::
5152
:maxdepth: 2
52-
:caption: Reference Manual
53+
:caption: Reference
5354

5455
configuration
5556
config_yaml
5657
build_settings
5758
mirrors
5859
module_file_support
59-
package_list
60+
repositories
6061
command_index
62+
package_list
6163

6264
.. toctree::
6365
:maxdepth: 2
64-
:caption: Tutorial
65-
66-
tutorial_sc16
67-
68-
.. toctree::
69-
:maxdepth: 2
70-
:caption: Contributing to Spack
66+
:caption: Contributing
7167

7268
contribution_guide
7369
packaging_guide
7470
developer_guide
7571
API Docs <spack>
7672

77-
7873
==================
7974
Indices and tables
8075
==================

‎lib/spack/docs/module_file_support.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ directly with automatically generated module files.
2424
we advise you to use either Environment Modules or LMod. See :ref:`InstallEnvironmentModules`
2525
for more details.
2626

27-
.. _shell_support:
27+
.. _shell-support:
2828

2929
-------------
3030
Shell support

‎lib/spack/docs/packaging_guide.rst‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,10 @@ always choose to download just one tarball initially, and run
9393
$ spack create --name cmake http://www.cmake.org/files/v2.8/cmake-2.8.12.1.tar.gz
9494
9595
If it fails entirely, you can get minimal boilerplate by using
96-
:ref:`spack edit --force <spack-edit-f>`, or you can manually create a directory and
97-
``package.py`` file for the package in ``var/spack/repos/builtin/packages``.
96+
:ref:`spack edit --force <spack-edit-f>`, or you can manually create a
97+
directory and ``package.py`` file for the package in
98+
``var/spack/repos/builtin/packages``, or within your own :ref:`package
99+
repository <repositories>`.
98100

99101
.. note::
100102

@@ -2026,8 +2028,8 @@ The last element of a package is its ``install()`` method. This is
20262028
where the real work of installation happens, and it's the main part of
20272029
the package you'll need to customize for each piece of software.
20282030

2029-
.. literalinclude:: ../../../var/spack/repos/builtin/packages/libpng/package.py
2030-
:pyobject: Libpng.install
2031+
.. literalinclude:: ../../../var/spack/repos/builtin/packages/mpfr/package.py
2032+
:pyobject: Mpfr.install
20312033
:linenos:
20322034

20332035
``install`` takes a ``spec``: a description of how the package should
@@ -3120,6 +3122,8 @@ example:
31203122
This graph can be provided as input to other graphing tools, such as
31213123
those in `Graphviz <http://www.graphviz.org>`_.
31223124

3125+
.. _packaging-shell-support:
3126+
31233127
-------------------------
31243128
Interactive shell support
31253129
-------------------------

0 commit comments

Comments
 (0)