diff options
author | alalazo <massimiliano.culpo@googlemail.com> | 2016-08-11 08:55:20 +0200 |
---|---|---|
committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-08-11 08:55:20 +0200 |
commit | b4b9ebe7d718d169dd5f2ab41d4cbc00fed88641 (patch) | |
tree | c6a4c9d60798a9502a6d1e2a6d0641a2041053ee /README.md | |
parent | b92deda41bf2995a8a7b717ea8149af7797e30d5 (diff) | |
parent | f59653ac2c9b20ec5954d90fda019c7652644ac9 (diff) | |
download | spack-b4b9ebe7d718d169dd5f2ab41d4cbc00fed88641.tar.gz spack-b4b9ebe7d718d169dd5f2ab41d4cbc00fed88641.tar.bz2 spack-b4b9ebe7d718d169dd5f2ab41d4cbc00fed88641.tar.xz spack-b4b9ebe7d718d169dd5f2ab41d4cbc00fed88641.zip |
Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases
Conflicts:
lib/spack/llnl/util/tty/log.py
lib/spack/spack/__init__.py
lib/spack/spack/cmd/install.py
lib/spack/spack/cmd/setup.py
lib/spack/spack/package.py
var/spack/repos/builtin/packages/blitz/package.py
var/spack/repos/builtin/packages/gmp/package.py
var/spack/repos/builtin/packages/qhull/package.py
var/spack/repos/builtin/packages/szip/package.py
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -58,17 +58,24 @@ can join it here: ### Contributions -At the moment, contributing to Spack is relatively simple. Just send us -a [pull request](https://help.github.com/articles/using-pull-requests/). +Contributing to Spack is relatively. Just send us a +[pull request](https://help.github.com/articles/using-pull-requests/). When you send your request, make ``develop`` the destination branch on the [Spack repository](https://github.com/LLNL/spack). -Your contribution will need to pass all the tests run by the `spack test` -command, as well as the formatting checks in `share/spack/qa/run-flake8`. -You should run both of these before submitting your pull request, to -ensure that the online checks succeed. +Before you send a PR, your code should pass the following checks: -Spack is using a rough approximation of the [Git +* Your contribution will need to pass the `spack test` command. + Run this before submitting your PR. + +* Also run the `share/spack/qa/run-flake8` script to check for PEP8 compliance. + To encourage contributions and readability by a broad audience, + Spack uses the [PEP8](https://www.python.org/dev/peps/pep-0008/) coding + standard with [a few exceptions](https://github.com/LLNL/spack/blob/develop/.flake8). + +We enforce these guidelines with [Travis CI](https://travis-ci.org/LLNL/spack). + +Spack uses 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 |