diff options
| author | Jacob Gillespie <jacobwgillespie@gmail.com> | 2018-05-01 21:26:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 21:26:59 -0500 |
| commit | 6c78195d75f2648a6c9973bcc783f23f817ac585 (patch) | |
| tree | 1c016dc8d0d710cbc23d2ea65cf8bc8209db98a7 /Tools | |
| parent | 0ba153c892e05fd45e12688ce726f1a4d45454b2 (diff) | |
| parent | 8b4d0d7921852b275401dec2809bacc5416aa9ca (diff) | |
| download | swig-6c78195d75f2648a6c9973bcc783f23f817ac585.tar.gz | |
Merge branch 'master' into js-v8-52-tests
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/travis-linux-install.sh | 8 | ||||
| -rwxr-xr-x | Tools/travis-osx-install.sh | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh index 57f97b604..cec76d812 100755 --- a/Tools/travis-linux-install.sh +++ b/Tools/travis-linux-install.sh @@ -13,6 +13,10 @@ elif [[ "$CC" == gcc-6 ]]; then travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test travis_retry sudo apt-get -qq update travis_retry sudo apt-get install -qq g++-6 +elif [[ "$CC" == gcc-7 ]]; then + travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + travis_retry sudo apt-get -qq update + travis_retry sudo apt-get install -qq g++-7 fi travis_retry sudo apt-get -qq install libboost-dev @@ -86,13 +90,13 @@ case "$SWIGLANG" in travis_retry sudo apt-get -qq install php$VER-cli php$VER-dev ;; "python") - pip install pep8 + pip install --user pycodestyle if [[ "$PY3" ]]; then travis_retry sudo apt-get install -qq python3-dev fi WITHLANG=$SWIGLANG$PY3 if [[ "$VER" ]]; then - travis_retry sudo add-apt-repository -y ppa:fkrull/deadsnakes + travis_retry sudo add-apt-repository -y ppa:deadsnakes/ppa travis_retry sudo apt-get -qq update travis_retry sudo apt-get -qq install python${VER}-dev WITHLANG=$SWIGLANG$PY3=$SWIGLANG$VER diff --git a/Tools/travis-osx-install.sh b/Tools/travis-osx-install.sh index 42cc33bb2..6bfb2276a 100755 --- a/Tools/travis-osx-install.sh +++ b/Tools/travis-osx-install.sh @@ -23,8 +23,7 @@ case "$SWIGLANG" in "python") WITHLANG=$SWIGLANG$PY3 if [[ "$PY3" ]]; then - travis_retry brew install python3 - travis_retry brew list -v python3 + travis_retry brew upgrade python fi ;; esac |