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 /.travis.yml | |
| 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 '.travis.yml')
| -rw-r--r-- | .travis.yml | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 904143a00f..b376a33490 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,17 @@ language: python + python: - "2.6" - "2.7" +env: + - TEST_TYPE=unit + - TEST_TYPE=flake8 + +# Exclude flake8 from python 2.6 +matrix: + exclude: + - python: "2.6" + env: TEST_TYPE=flake8 # Use new Travis infrastructure (Docker can't sudo yet) sudo: false @@ -20,20 +30,13 @@ before_install: - git fetch origin develop:develop script: - # Regular spack setup and tests - - . share/spack/setup-env.sh - - spack compilers - - spack config get compilers - - spack install -v libdwarf - - # Run unit tests with code coverage - - coverage run bin/spack test - + # Run unit tests with code coverage plus install libdwarf + - 'if [ "$TEST_TYPE" = "unit" ]; then share/spack/qa/run-unit-tests; fi' # Run flake8 code style checks. - - share/spack/qa/run-flake8 + - 'if [ "$TEST_TYPE" = "flake8" ]; then share/spack/qa/run-flake8; fi' after_success: - - coveralls + - 'if [ "$TEST_TYPE" = "unit" ] && [ "$TRAVIS_PYTHON_VERSION" = "2.7" ]; then coveralls; fi' notifications: email: |