Skip to content

Commit 83d729c

Browse files
m-kuhnm-kuhn
committedMar 22, 2016
Switch to python 3.3 and new binary osgeo4travis
·
ltr-3_40archive/master_2
1 parent 921835f commit 83d729c

File tree

5 files changed

+27
-53
lines changed

5 files changed

+27
-53
lines changed
 

‎.travis.yml

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
language: cpp
21

32
matrix:
43
include:
54
# QT4 based build with Python 2 // using a sudo environment
65
- os: linux
6+
language: cpp
77
env: QT_VERSION=4
88
sudo: true
99
dist: precise
@@ -14,13 +14,15 @@ matrix:
1414
- clang
1515
# QT5 based build with Python 3 // using container based builds and prebuild binary dependencies in osgeo4travis
1616
- os: linux
17+
language: python # This lets us use newer python versions from virtualenv
1718
env: QT_VERSION=5
1819
sudo: false
1920
cache:
2021
apt: true
21-
# ccache: true # Temporarily disabled https://github.com/qgis/QGIS/pull/2908
22-
compiler:
23-
- clang
22+
directories:
23+
- $HOME/.ccache
24+
compiler: clang
25+
python: "3.3"
2426
addons:
2527
postgresql: "9.4"
2628
apt:
@@ -37,34 +39,29 @@ matrix:
3739
- libfcgi-dev
3840
- pkg-config
3941
- poppler-utils
40-
- python3
41-
- python3-dev
42-
- python3-setuptools
4342
- txt2tags
4443
- xvfb
4544
- flip
4645
- clang-3.6
4746
# OSX based build with QT4 and Python 2
4847
- os: osx
4948

50-
5149
git:
5250
depth: 30
5351

54-
55-
notifications:
56-
irc: "chat.freenode.net#qgis-test"
57-
on_failure: change
58-
on_success: change
59-
skip_join: true
60-
61-
notifications:
62-
webhooks:
63-
urls:
64-
- https://webhooks.gitter.im/e/467e3aff72e344d1dae3
65-
on_success: change # options: [always|never|change] default: always
66-
on_failure: always # options: [always|never|change] default: always
67-
on_start: never # default: never
52+
# notifications:
53+
# irc: "chat.freenode.net#qgis-test"
54+
# on_failure: change
55+
# on_success: change
56+
# skip_join: true
57+
#
58+
# notifications:
59+
# webhooks:
60+
# urls:
61+
# - https://webhooks.gitter.im/e/467e3aff72e344d1dae3
62+
# on_success: change # options: [always|never|change] default: always
63+
# on_failure: always # options: [always|never|change] default: always
64+
# on_start: never # default: never
6865

6966
before_install:
7067
- ./ci/travis/${TRAVIS_OS_NAME}/before_install.sh

‎ci/travis/linux/qt5/before_install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export CORES=2
99

1010
pushd ${HOME}
1111

12-
curl -L https://github.com/opengisch/osgeo4travis/raw/binary/osgeo4travis.tar.xz | tar -JxC /home/travis
12+
curl -L https://github.com/opengisch/osgeo4travis/raw/binary-py33/osgeo4travis.tar.xz | tar -JxC /home/travis
1313
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
1414
popd
1515

16-
# easy_install3 --prefix=${HOME}/osgeo4travis/ pyspatialite
16+
pip install psycopg2 numpy nose2 pyyaml mock future

‎ci/travis/linux/qt5/blacklist.txt

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ PyQgsVirtualLayerDefinition
7474
PyQgsVirtualLayerProvider
7575
PyQgsZonalStatistics
7676
qgis_alignrastertest
77-
qgis_attributetabletest
78-
qgis_authmanagertest
79-
qgis_blendmodestest
77+
qgis_atlascompositiontest
8078
qgis_composereffectstest
8179
qgis_composermapgridtest
8280
qgis_composermapoverviewtest
@@ -91,40 +89,19 @@ qgis_composertabletest
9189
qgis_composertablev2test
9290
qgis_composerutils
9391
qgis_coordinatereferencesystemtest
94-
qgis_doublespinbox
95-
qgis_dualviewtest
9692
qgis_ellipsemarkertest
97-
qgis_fieldcalculatortest
9893
qgis_fieldexpressionwidget
9994
qgis_fieldtest
100-
qgis_filewidget
101-
qgis_gdalprovidertest
10295
qgis_geometrytest
10396
qgis_gradienttest
10497
qgis_labelingenginev2
10598
qgis_legendrenderertest
10699
qgis_linefillsymboltest
107-
qgis_mapcanvastest
108100
qgis_maprenderertest
109101
qgis_maprotationtest
110-
qgis_maptoolidentifyaction
111102
qgis_markerlinessymboltest
112-
qgis_measuretool
113-
qgis_openstreetmaptest
114103
qgis_painteffecttest
115104
qgis_pointpatternfillsymboltest
116-
qgis_projectionissues
117-
qgis_qgisappclipboard
118-
qgis_qgsguitest
119-
qgis_rastercalculatortest
120-
qgis_rasterfilewritertest
121105
qgis_rasterlayertest
122-
qgis_rubberbandtest
123-
qgis_scalecombobox
124106
qgis_simplemarkertest
125-
qgis_spinbox
126107
qgis_svgmarkertest
127-
qgis_vectorlayerjoinbuffer
128-
qgis_wcsprovidertest
129-
qgis_ziplayertest
130-
qgis_zoomtest

‎ci/travis/linux/qt5/install.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
mkdir build
22
cd build
33

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

77
ccache -s
88

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

1414
cmake --version
1515
${CC} --version
@@ -38,5 +38,4 @@ cmake \
3838
-DENABLE_QT5=ON \
3939
-DENABLE_PYTHON3=ON \
4040
-DCXX_EXTRA_FLAGS="$CLANG_WARNINGS" \
41-
-DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so \
4241
..

‎ci/travis/linux/qt5/script.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3/dist-packages/
1+
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/
22

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

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

0 commit comments

Comments
 (0)
Please sign in to comment.