Skip to content

Commit

Permalink
Merge pull request #234 from geometalab/dev-qgis3
Browse files Browse the repository at this point in the history
Dev qgis3
  • Loading branch information
mnboos authored Mar 20, 2019
2 parents 24eaa23 + f104cf3 commit f7469d1
Show file tree
Hide file tree
Showing 91 changed files with 772 additions and 779 deletions.
43 changes: 42 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
matrix:
include:
- language: python
name: qgis:latest
python: 3.6
dist: xenial
sudo: true
Expand All @@ -14,7 +15,7 @@ matrix:
- pip install flake8 mypy
- flake8 plugin
install:
- cd docker && docker-compose up -d
- cd docker && docker-compose build --build-arg QGIS_TAG=latest && docker-compose up -d
- sleep 10 # This is required to allow xvfb to start
script:
- docker exec -it qgis3 sh -c "qgis_testrunner.sh tests_directory"
Expand All @@ -37,6 +38,46 @@ matrix:
tags: true
branch: master-qgis3

- language: python
name: qgis:release-3_6
python: 3.6
dist: xenial
sudo: true
branches:
only:
- master-qgis3
- dev-qgis3
services:
- docker
before_install:
- pip install flake8 mypy
- flake8 plugin
install:
- cd docker && docker-compose build --build-arg QGIS_TAG=release-3_6 && docker-compose up -d
- sleep 10 # This is required to allow xvfb to start
script:
- docker exec -it qgis3 sh -c "qgis_testrunner.sh tests_directory"
-
- language: python
name: qgis:release-3_4
python: 3.6
dist: xenial
sudo: true
branches:
only:
- master-qgis3
- dev-qgis3
services:
- docker
before_install:
- pip install flake8 mypy
- flake8 plugin
install:
- cd docker && docker-compose build --build-arg QGIS_TAG=release-3_4 && docker-compose up -d
- sleep 10 # This is required to allow xvfb to start
script:
- docker exec -it qgis3 sh -c "qgis_testrunner.sh tests_directory"

- language: cpp
branches:
only:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![Build Status](https://travis-ci.org/geometalab/Vector-Tiles-Reader-QGIS-Plugin.svg?branch=master)](https://travis-ci.org/geometalab/Vector-Tiles-Reader-QGIS-Plugin)
[![Coverage Status](https://coveralls.io/repos/github/geometalab/Vector-Tiles-Reader-QGIS-Plugin/badge.svg?branch=HEAD)](https://coveralls.io/github/geometalab/Vector-Tiles-Reader-QGIS-Plugin?branch=HEAD)
[![Build Status](https://travis-ci.org/geometalab/Vector-Tiles-Reader-QGIS-Plugin.svg?branch=dev-qgis3)](https://travis-ci.org/geometalab/Vector-Tiles-Reader-QGIS-Plugin)
[![codecov](https://codecov.io/gh/geometalab/Vector-Tiles-Reader-QGIS-Plugin/branch/dev-qgis3/graph/badge.svg)](https://codecov.io/gh/geometalab/Vector-Tiles-Reader-QGIS-Plugin)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)

# Vector Tiles Reader QGIS-Plugin
Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM qgis/qgis:latest
ARG QGIS_TAG
FROM qgis/qgis:${QGIS_TAG}
MAINTAINER Martin Boos

RUN qgis_setup.sh vector_tiles_reader && \
Expand Down
98 changes: 0 additions & 98 deletions ext-libs/mapboxstyle2qgis/tests/test_filters.py

This file was deleted.

Loading

0 comments on commit f7469d1

Please sign in to comment.