Skip to content

Commit

Permalink
Shift Travis away from using Tox.
Browse files Browse the repository at this point in the history
  • Loading branch information
lukesneeringer committed Jan 25, 2014
1 parent 272b2b4 commit b133cd8
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
language: python
python:
- 3.3
- 2.7
env:
- ADDITIONAL_REQUIREMENTS='django>=1.6,<1.7 south>=0.8'
- ADDITIONAL_REQUIREMENTS='django>=1.6,<1.7'
- ADDITIONAL_REQUIREMENTS='django>=1.5,<1.6 south>=0.8'
- ADDITIONAL_REQUIREMENTS='django>=1.5,<1.6'
addons:
postgresql: 9.2
branches:
Expand All @@ -12,11 +18,14 @@ install:
- pip install --upgrade setuptools pip
- pip install -r requirements.txt
- pip install -r tests/requirements.txt
- pip install $ADDITIONAL_REQUIREMENTS
- pip install coveralls

# Create our database.
- psql -U postgres -c 'create database django_pg;'
- psql -U postgres -d django_pg -c 'create extension postgis;'
script: python setup.py test
script:
- coverage run -p tests/runtests.py
- coverage run -p tests/runtests.py gis
after_success:
- coveralls

0 comments on commit b133cd8

Please sign in to comment.