Skip to content

Commit af02a07

Browse files
committed
Add libsodium dependency as a PPA to Travis file
1 parent cff16be commit af02a07

File tree

2 files changed

+29
-39
lines changed

2 files changed

+29
-39
lines changed

.travis-install-libsodium.sh

-14
This file was deleted.

.travis.yml

+29-25
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
# Use container system
22
sudo: false
33

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
513
cache:
614
directories:
7-
- $HOME/libsodium
815
- $HOME/.cache/pip
916

1017
# Clean up pip log
1118
before_cache:
12-
- rm -f $HOME/.cache/pip/log/debug.log
19+
- rm -f $HOME/.cache/pip/log/debug.log
1320

1421
# Build matrix
1522
language: python
@@ -55,37 +62,34 @@ matrix:
5562
# TODO: Re-enable once pypy3 is able to compile uvloop
5663
# - python: "pypy3" # 2017-08-05: It's pypy3-5.8.0-beta
5764
# env:
58-
# - EVENT_LOOP=uvloop
59-
# - TIMEOUT=16.0
65+
# - EVENT_LOOP=uvloop
66+
# - TIMEOUT=16.0
6067
# before_script: "pip install .[uvloop]"
6168

6269
# Install dependencies
63-
before_install:
64-
- ./.travis-install-libsodium.sh
65-
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${HOME}/libsodium/lib
6670
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
7074

7175
# Run flake8, isort, check docs & tests
7276
# TODO: Re-enable isort once #85 has been resolved
7377
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
8791
8892
# After success
8993
after_success:
90-
- codecov
94+
- codecov
9195

0 commit comments

Comments
 (0)