Commit a46c71e3c8e81adfbe8cc5673af877db708aa445
Merge branch 'patch-1' of github.com:GUIpsp/antigen into patch-1
Conflicts: .travis.yml
Showing 1 changed file Side-by-side Diff
.travis.yml
| 1 | -# Using python for running the tests, using `cram` test framework. | |
| 1 | +# Using python for running the tests, using the `cram` test framework. | |
| 2 | 2 | language: python |
| 3 | 3 | |
| 4 | 4 | # Python version to run tests with. |
| 5 | 5 | python: |
| 6 | 6 | - "2.7" |
| 7 | 7 | |
| 8 | +env: | |
| 9 | + # Default zsh | |
| 10 | + - PPA="none" | |
| 11 | + # zsh 5 PPA | |
| 12 | + - PPA="ppa:brainpower/testing" | |
| 13 | + | |
| 14 | +install: | |
| 15 | + # Add PPA if needed | |
| 16 | + - "./.travis-ci.sh" | |
| 17 | + # Install python requirements. | |
| 18 | + - "pip install -r requirements.txt --use-mirrors" | |
| 19 | + # Install zsh. | |
| 20 | + - "sudo apt-get install zsh" | |
| 21 | + | |
| 8 | 22 | before_script: |
| 9 | 23 | |
| 10 | 24 | # Show the git version being used to test. |
| ... | ... | @@ -17,19 +31,5 @@ before_script: |
| 17 | 31 | - "git config --global user.name test" |
| 18 | 32 | - "git config --global user.email test@test.test" |
| 19 | 33 | |
| 20 | -install: | |
| 21 | - # Add PPA if needed | |
| 22 | - - "./.travis-ci.sh" | |
| 23 | - # Install python requirements. | |
| 24 | - - "pip install -r requirements.txt --use-mirrors" | |
| 25 | - # Install zsh. | |
| 26 | - - "sudo apt-get install zsh" | |
| 27 | - | |
| 28 | 34 | # Run the tests. |
| 29 | 35 | script: "make tests" |
| 30 | - | |
| 31 | -env: | |
| 32 | - # Default zsh | |
| 33 | - - PPA="none" | |
| 34 | - # zsh 5 PPA | |
| 35 | - - PPA="ppa:brainpower/testing" |