|
1 | 1 | # Use container system
|
2 | 2 | sudo: false
|
3 | 3 |
|
4 |
| -# Cache pip & libsodium |
| 4 | +# Install APT dependencies |
| 5 | +addons: |
| 6 | + apt: |
| 7 | + sources: |
| 8 | + - sourceline: "ppa:chris-lea/libsodium" |
| 9 | + packages: |
| 10 | + - libsodium-dev |
| 11 | + |
| 12 | +# Cache pip |
5 | 13 | cache:
|
6 | 14 | directories:
|
7 |
| - - $HOME/libsodium |
8 | 15 | - $HOME/.cache/pip
|
9 | 16 |
|
10 | 17 | # Clean up pip log
|
11 | 18 | before_cache:
|
12 |
| - - rm -f $HOME/.cache/pip/log/debug.log |
| 19 | +- rm -f $HOME/.cache/pip/log/debug.log |
13 | 20 |
|
14 | 21 | # Build matrix
|
15 | 22 | language: python
|
@@ -55,37 +62,34 @@ matrix:
|
55 | 62 | # TODO: Re-enable once pypy3 is able to compile uvloop
|
56 | 63 | # - python: "pypy3" # 2017-08-05: It's pypy3-5.8.0-beta
|
57 | 64 | # env:
|
58 |
| -# - EVENT_LOOP=uvloop |
59 |
| -# - TIMEOUT=16.0 |
| 65 | +# - EVENT_LOOP=uvloop |
| 66 | +# - TIMEOUT=16.0 |
60 | 67 | # before_script: "pip install .[uvloop]"
|
61 | 68 |
|
62 | 69 | # Install dependencies
|
63 |
| -before_install: |
64 |
| - - ./.travis-install-libsodium.sh |
65 |
| - - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${HOME}/libsodium/lib |
66 | 70 | install:
|
67 |
| - - pip install -U setuptools pip |
68 |
| - - "pip install .[dev]" |
69 |
| - - pip install codecov |
| 71 | +- pip install -U setuptools pip |
| 72 | +- "pip install .[dev]" |
| 73 | +- pip install codecov |
70 | 74 |
|
71 | 75 | # Run flake8, isort, check docs & tests
|
72 | 76 | # TODO: Re-enable isort once #85 has been resolved
|
73 | 77 | script:
|
74 |
| - - > |
75 |
| - if [[ "$TRAVIS_PYTHON_VERSION" != "pypy3" ]]; then |
76 |
| - flake8 . || travis_terminate 1; |
77 |
| - #isort -rc -c . || (isort -rc -df . && return 1) || travis_terminate 1; |
78 |
| - fi |
79 |
| - - python setup.py checkdocs |
80 |
| - - > |
81 |
| - py.test \ |
82 |
| - --ignore=$IGNORE \ |
83 |
| - --cov-config .coveragerc \ |
84 |
| - --cov=saltyrtc.server \ |
85 |
| - --loop=$EVENT_LOOP \ |
86 |
| - --timeout=$TIMEOUT |
| 78 | +- > |
| 79 | + if [[ "$TRAVIS_PYTHON_VERSION" != "pypy3" ]]; then |
| 80 | + flake8 . || travis_terminate 1; |
| 81 | + #isort -rc -c . || (isort -rc -df . && return 1) || travis_terminate 1; |
| 82 | + fi |
| 83 | +- python setup.py checkdocs |
| 84 | +- > |
| 85 | + py.test \ |
| 86 | + --ignore=$IGNORE \ |
| 87 | + --cov-config .coveragerc \ |
| 88 | + --cov=saltyrtc.server \ |
| 89 | + --loop=$EVENT_LOOP \ |
| 90 | + --timeout=$TIMEOUT |
87 | 91 |
|
88 | 92 | # After success
|
89 | 93 | after_success:
|
90 |
| - - codecov |
| 94 | +- codecov |
91 | 95 |
|
0 commit comments