Skip to content
Permalink
Browse files

Switch to python 3.3 and new binary osgeo4travis

  • Loading branch information
m-kuhn committed Mar 22, 2016
1 parent 921835f commit 83d729c0fb619b35b4dd440522e8f8de2759854c
@@ -1,9 +1,9 @@
language: cpp

matrix:
include:
# QT4 based build with Python 2 // using a sudo environment
- os: linux
language: cpp
env: QT_VERSION=4
sudo: true
dist: precise
@@ -14,13 +14,15 @@ matrix:
- clang
# QT5 based build with Python 3 // using container based builds and prebuild binary dependencies in osgeo4travis
- os: linux
language: python # This lets us use newer python versions from virtualenv
env: QT_VERSION=5
sudo: false
cache:
apt: true
# ccache: true # Temporarily disabled https://github.com/qgis/QGIS/pull/2908
compiler:
- clang
directories:
- $HOME/.ccache
compiler: clang
python: "3.3"
addons:
postgresql: "9.4"
apt:
@@ -37,34 +39,29 @@ matrix:
- libfcgi-dev
- pkg-config
- poppler-utils
- python3
- python3-dev
- python3-setuptools
- txt2tags
- xvfb
- flip
- clang-3.6
# OSX based build with QT4 and Python 2
- os: osx


git:
depth: 30


notifications:
irc: "chat.freenode.net#qgis-test"
on_failure: change
on_success: change
skip_join: true

notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/467e3aff72e344d1dae3
on_success: change # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: never # default: never
# notifications:
# irc: "chat.freenode.net#qgis-test"
# on_failure: change
# on_success: change
# skip_join: true
#
# notifications:
# webhooks:
# urls:
# - https://webhooks.gitter.im/e/467e3aff72e344d1dae3
# on_success: change # options: [always|never|change] default: always
# on_failure: always # options: [always|never|change] default: always
# on_start: never # default: never

before_install:
- ./ci/travis/${TRAVIS_OS_NAME}/before_install.sh
@@ -9,8 +9,8 @@ export CORES=2

pushd ${HOME}

curl -L https://github.com/opengisch/osgeo4travis/raw/binary/osgeo4travis.tar.xz | tar -JxC /home/travis
curl -L https://github.com/opengisch/osgeo4travis/raw/binary-py33/osgeo4travis.tar.xz | tar -JxC /home/travis
curl -L https://cmake.org/files/v3.5/cmake-3.5.0-Linux-x86_64.tar.gz | tar --strip-components=1 -zxC /home/travis/osgeo4travis
popd

# easy_install3 --prefix=${HOME}/osgeo4travis/ pyspatialite
pip install psycopg2 numpy nose2 pyyaml mock future
@@ -74,9 +74,7 @@ PyQgsVirtualLayerDefinition
PyQgsVirtualLayerProvider
PyQgsZonalStatistics
qgis_alignrastertest
qgis_attributetabletest
qgis_authmanagertest
qgis_blendmodestest
qgis_atlascompositiontest
qgis_composereffectstest
qgis_composermapgridtest
qgis_composermapoverviewtest
@@ -91,40 +89,19 @@ qgis_composertabletest
qgis_composertablev2test
qgis_composerutils
qgis_coordinatereferencesystemtest
qgis_doublespinbox
qgis_dualviewtest
qgis_ellipsemarkertest
qgis_fieldcalculatortest
qgis_fieldexpressionwidget
qgis_fieldtest
qgis_filewidget
qgis_gdalprovidertest
qgis_geometrytest
qgis_gradienttest
qgis_labelingenginev2
qgis_legendrenderertest
qgis_linefillsymboltest
qgis_mapcanvastest
qgis_maprenderertest
qgis_maprotationtest
qgis_maptoolidentifyaction
qgis_markerlinessymboltest
qgis_measuretool
qgis_openstreetmaptest
qgis_painteffecttest
qgis_pointpatternfillsymboltest
qgis_projectionissues
qgis_qgisappclipboard
qgis_qgsguitest
qgis_rastercalculatortest
qgis_rasterfilewritertest
qgis_rasterlayertest
qgis_rubberbandtest
qgis_scalecombobox
qgis_simplemarkertest
qgis_spinbox
qgis_svgmarkertest
qgis_vectorlayerjoinbuffer
qgis_wcsprovidertest
qgis_ziplayertest
qgis_zoomtest
@@ -1,15 +1,15 @@
mkdir build
cd build

ln -s /usr/bin/ccache ${HOME}/osgeo4travis/bin/clang++-3.6
ln -s /usr/bin/ccache ${HOME}/osgeo4travis/bin/clang-3.6
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang++-3.6
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-3.6

ccache -s

export CXX="clang++-3.6"
export CC="clang-3.6"
export PATH=${HOME}/osgeo4travis/bin:${PATH}
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3/dist-packages/
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/

cmake --version
${CC} --version
@@ -38,5 +38,4 @@ cmake \
-DENABLE_QT5=ON \
-DENABLE_PYTHON3=ON \
-DCXX_EXTRA_FLAGS="$CLANG_WARNINGS" \
-DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so \
..
@@ -1,5 +1,6 @@
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3/dist-packages/
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
# xvfb-run ctest -V -S ./qgis-test-travis.ctest --output-on-failure

0 comments on commit 83d729c

Please sign in to comment.
You can’t perform that action at this time.