diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2015-08-26 07:57:23 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2015-08-26 07:57:23 -0300 |
| commit | 70ceb871117ca811d63cb02671dc0fefc2700883 (patch) | |
| tree | 846133ea39797d2cd1101cff2ac0818167353490 /.travis.yml | |
| parent | 8559119e2f45b7f6508282962c0430423bfab051 (diff) | |
| parent | 787b97a4cb24330b36f11297c6d3a7a473a907d0 (diff) | |
Merge tag 'upstream/7.6.4'
Upstream version 7.6.4
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 123e481..f3b4857 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,13 @@ before_install: - - "if [[ $NMODE == 'nikola' ]]; then sudo apt-get update -qq || true; fi" - - "if [[ $NMODE == 'nikola' ]]; then sudo apt-get --reinstall install -qq language-pack-en-base language-pack-pl-base; fi" - "pip install --upgrade pip wheel" language: python cache: apt +sudo: false +addons: + apt: + packages: + - language-pack-en-base + - language-pack-pl-base python: - "2.7" - "3.3" @@ -19,17 +23,18 @@ install: - "if [[ $NMODE == 'nikola' ]]; then pip install -r requirements-tests.txt; if [[ \"$?\" == '1' ]]; then cat /home/travis/.pip/pip.log; false; fi; fi" - "if [[ $NMODE == 'nikola' ]]; then pip install .; fi" - "if [[ $NMODE == 'nikola' ]]; then scripts/getbaseline.sh $(scripts/getpyver.py short); fi" - - "if [[ $NMODE == 'flake8' ]]; then pip install flake8; fi" + - "if [[ $NMODE == 'flake8' ]]; then pip install flake8 pep257; fi" # We run tests and nikola (to see if the command is executable) OR flake8. # We run `nikola` and `nikola help` because things may break due to human # errors in argument parsing (cf. 96e78dd) -# WARNING: if you edit this, make sure to replicate your changes in dodo.py. +# WARNING: if you edit this, make sure to replicate your changes in dodo.py and appveyor.yml. script: - "if [[ $NMODE == 'nikola' ]]; then py.test --doctest-modules nikola/; fi" - "if [[ $NMODE == 'nikola' ]]; then py.test --cov nikola --cov-report term-missing tests/; fi" - "if [[ $NMODE == 'nikola' ]]; then nikola; fi" - "if [[ $NMODE == 'nikola' ]]; then nikola help; fi" - "if [[ $NMODE == 'flake8' ]]; then flake8 nikola/; fi" + - "if [[ $NMODE == 'flake8' ]]; then pep257 --count --match-dir='(?!^\\\\.)(?!data).*' nikola/; fi" after_success: - "if [[ $NMODE == 'nikola' ]]; then coveralls; fi" notifications: |