Merge for minor release: 0.8.17

Chiasung · Mar 24, 2015 · 6776c19 · 6776c19
2 parents 1414480 + b2f54ba
commit 6776c19
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -32,6 +32,36 @@ Documentation
 [Full documentation](http://scalability-llnl.github.io/spack)
 for Spack is also available.
 
+Get Involved!
+------------------------
+
+Spack is an open source project.  Questions, discussion, and
+contributions are welcome. Contributions can be anything from new
+packages to bugfixes, or even new core features.
+
+### Mailing list
+
+If you are interested in contributing to spack, the first step is to
+join the mailing list.  We're currently using LLNL's old-fashioned
+mailing list software, so you'll need to click the links below and
+send the resulting email to subscribe or unsubscribe:
+
+  * **[Subscribe](mailto:majordomo@lists.llnl.gov?subject=subscribe&body=subscribe%20spack)**
+  * **[Unsubscribe](mailto:majordomo@lists.llnl.gov?subject=unsubscribe&body=unsubscribe%20spack)**
+
+### Contributions
+
+At the moment, contributing to Spack is relatively simple.  Just send us
+a [pull request](https://help.github.com/articles/using-pull-requests/).
+When you send your request, make ``develop`` the destination branch.
+
+Spack is using a rough approximation of the [Git
+Flow](http://nvie.com/posts/a-successful-git-branching-model/)
+branching model.  The ``develop`` branch contains the latest
+contributions, and ``master`` is always tagged and points to the
+latest stable release.
+
+
 Authors
 ----------------
 Spack was written by Todd Gamblin, tgamblin@llnl.gov.

diff --git a/lib/spack/docs/_themes/sphinx_rtd_theme/layout.html b/lib/spack/docs/_themes/sphinx_rtd_theme/layout.html
@@ -87,6 +87,17 @@
 
   <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
 
+  <!-- Google Analytics -->
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-55665759-2', 'auto');
+    ga('send', 'pageview');
+  </script>
+
 </head>
 
 <body class="wy-body-for-nav">

diff --git a/lib/spack/spack/cmd/spec.py b/lib/spack/spack/cmd/spec.py
@@ -33,20 +33,27 @@
 description = "print out abstract and concrete versions of a spec."
 
 def setup_parser(subparser):
+    subparser.add_argument('-i', '--ids', action='store_true',
+                           help="show numerical ids for dependencies.")
     subparser.add_argument('specs', nargs=argparse.REMAINDER, help="specs of packages")
 
+
 def spec(parser, args):
+    kwargs = { 'ids'    : args.ids,
+               'indent' : 2,
+               'color'  : True }
+
     for spec in spack.cmd.parse_specs(args.specs):
         print "Input spec"
         print "------------------------------"
-        print spec.tree(color=True, indent=2)
+        print spec.tree(**kwargs)
 
         print "Normalized"
         print "------------------------------"
         spec.normalize()
-        print spec.tree(color=True, indent=2)
+        print spec.tree(**kwargs)
 
         print "Concretized"
         print "------------------------------"
         spec.concretize()
-        print spec.tree(color=True, indent=2)
+        print spec.tree(**kwargs)