Merge pull request #42 from aarranz/feature/improved-ci
CI: General improvements
This commit is contained in:
commit
b0e30ae0f9
14
.travis.yml
14
.travis.yml
|
@ -3,7 +3,9 @@ language: python
|
||||||
python:
|
python:
|
||||||
- "2.7"
|
- "2.7"
|
||||||
env:
|
env:
|
||||||
- CKANVERSION=2.7.2 POSTGISVERSION=2
|
- CKANVERSION=2.6.3
|
||||||
|
- CKANVERSION=2.7.3
|
||||||
|
- CKANVERSION=2.8.0
|
||||||
services:
|
services:
|
||||||
- redis-server
|
- redis-server
|
||||||
- postgresql
|
- postgresql
|
||||||
|
@ -12,12 +14,12 @@ addons:
|
||||||
install:
|
install:
|
||||||
- bash bin/travis-build.bash
|
- bash bin/travis-build.bash
|
||||||
before_script:
|
before_script:
|
||||||
- "export DISPLAY=:99.0"
|
- "export DISPLAY=:99.0"
|
||||||
- "sh -e /etc/init.d/xvfb start"
|
- "sh -e /etc/init.d/xvfb start"
|
||||||
- sleep 3 # give xvfb some time to start
|
- sleep 3 # give xvfb some time to start
|
||||||
script:
|
script:
|
||||||
- sh bin/travis-run.sh
|
- sh bin/travis-run.sh
|
||||||
after_success: coveralls
|
after_success: coveralls
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- develop
|
- master
|
||||||
|
|
11
setup.cfg
11
setup.cfg
|
@ -1,3 +1,9 @@
|
||||||
|
[bdist_wheel]
|
||||||
|
universal = 1
|
||||||
|
|
||||||
|
[flake8]
|
||||||
|
ignore=E501
|
||||||
|
|
||||||
[metadata]
|
[metadata]
|
||||||
description-file = README.md
|
description-file = README.md
|
||||||
|
|
||||||
|
@ -9,4 +15,7 @@ with-coverage=1
|
||||||
cover-package=ckanext.privatedatasets
|
cover-package=ckanext.privatedatasets
|
||||||
cover-inclusive=1
|
cover-inclusive=1
|
||||||
cover-erase=1
|
cover-erase=1
|
||||||
cover-xml=1
|
cover-xml=1
|
||||||
|
|
||||||
|
[pep8]
|
||||||
|
ignore=E501
|
||||||
|
|
Loading…
Reference in New Issue