diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-07-06 17:38:10 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-07-08 00:05:01 +0200 |
| commit | d44e1e268c5da846455d3f73f94a283e80340b6c (patch) | |
| tree | ce1941e7e5fde09e7f1fcaaa13f1f8d81ca2f066 /travis/osx | |
| parent | 076e62a9357e819a0c13b3fb1915c29a2b3c98d5 (diff) | |
| download | PROJ-d44e1e268c5da846455d3f73f94a283e80340b6c.tar.gz PROJ-d44e1e268c5da846455d3f73f94a283e80340b6c.zip | |
Travis: add testing of JSON output against schema and upgrade everything to Python3
Diffstat (limited to 'travis/osx')
| -rwxr-xr-x | travis/osx/before_install.sh | 6 | ||||
| -rwxr-xr-x | travis/osx/install.sh | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/travis/osx/before_install.sh b/travis/osx/before_install.sh index 964fbc67..55c0667a 100755 --- a/travis/osx/before_install.sh +++ b/travis/osx/before_install.sh @@ -2,6 +2,8 @@ set -e +export PATH=$HOME/Library/Python/3.6/bin:$PATH + ./travis/before_install.sh brew update @@ -10,8 +12,6 @@ brew install sqlite3 brew install doxygen brew install md5sha1sum -export PATH=$HOME/Library/Python/2.7/bin:$PATH -# breathe=4.12.0 is the last version to work for us with sphinx 1.8.5 / Python 2 -pip install --user sphinx sphinx-rtd-theme sphinxcontrib-bibtex breathe==4.12.0 +pip3 install --user sphinx sphinx-rtd-theme sphinxcontrib-bibtex breathe which sphinx-build (cd docs; make html) diff --git a/travis/osx/install.sh b/travis/osx/install.sh index 4869ee65..ff5266f6 100755 --- a/travis/osx/install.sh +++ b/travis/osx/install.sh @@ -5,4 +5,6 @@ set -e export CCACHE_CPP2=yes export PROJ_DB_CACHE_DIR="$HOME/.ccache" +export PATH=$HOME/Library/Python/3.6/bin:$PATH + CC="ccache clang" CXX="ccache clang++" CFLAGS="-Werror -O2" CXXFLAGS="-Werror -O2" ./travis/install.sh |