Skip to content

Commit a80f3d0

Browse files
authoredJan 23, 2019
Merge branch 'master' into sirs_db_manager
2 parents 00852f1 + 52df292 commit a80f3d0

File tree

549 files changed

+38057
-8243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

549 files changed

+38057
-8243
lines changed
 

‎.docker/qgis.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ COPY .docker/qgis_resources/supervisor/supervisor.xvfb.conf /etc/supervisor/supe
6565
# - deb installed
6666
# - built from git
6767
# needed to find PyQt wrapper provided by QGIS
68-
ENV PYTHONPATH=/usr/share/qgis/python/:/usr/lib/python3/dist-packages/qgis:/usr/share/qgis/python/qgis
68+
ENV PYTHONPATH=/usr/share/qgis/python/:/usr/share/qgis/python/plugins:/usr/lib/python3/dist-packages/qgis:/usr/share/qgis/python/qgis
6969

7070

7171
WORKDIR /

‎.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ matrix:
3232
# QGIS TESTS ON BIONIC
3333
##########################################################
3434
- os: linux
35+
name: building and testing on linux
3536
if: type != cron
3637
services: docker
3738
env:
@@ -44,6 +45,7 @@ matrix:
4445
# CODE LAYOUT
4546
##########################################################
4647
- os: linux
48+
name: code layout
4749
if: type != cron
4850
env:
4951
- TRAVIS_CONFIG=code_layout
@@ -93,6 +95,7 @@ matrix:
9395
# BIONIC DOCKER BUILD ON CRON OR TAG
9496
##########################################################
9597
- os: linux
98+
name: bionic docker build
9699
if: repo = qgis/QGIS AND (tag IS PRESENT OR type = cron)
97100
services: docker
98101
env:
@@ -105,6 +108,7 @@ matrix:
105108
# COSMIC DOCKER BUILD ON CRON OR TAG
106109
##########################################################
107110
- os: linux
111+
name: cosmic docker build
108112
if: repo = qgis/QGIS AND (tag IS PRESENT OR type = cron)
109113
services: docker
110114
env:

0 commit comments

Comments
 (0)
Please sign in to comment.