Skip to content

Commit

Permalink
Updating autotest. Adding additional django versions in travis.
Browse files Browse the repository at this point in the history
  • Loading branch information
constantinius committed Jun 24, 2015
1 parent 4eee336 commit 36da39e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
language: python
env:
- 'DJANGO="1.4.13" GDAL=1.10 DB=spatialite'
- 'DJANGO="1.5.8" GDAL=1.10 DB=spatialite'
#- DJANGO=1.6 GDAL=1.10 DB=spatialite
- 'DJANGO=">=1.4,<1.5" GDAL=1.10 DB=spatialite' # Django 1.4
- 'DJANGO=">=1.5,<1.6" GDAL=1.10 DB=spatialite' # Django 1.5
- 'DJANGO=">=1.6,<1.7" GDAL=1.10 DB=spatialite' # Django 1.6
# django 1.7 is currently broken --> https://code.djangoproject.com/ticket/22442
- 'DJANGO=">=1.8,<1.9" GDAL=1.10 DB=spatialite' # Django 1.8
python:
- "2.7"
virtualenv:
Expand All @@ -26,10 +28,10 @@ before_install:
- 'if [ "$DB" == "postgis" ]; then sudo -u postgres psql eoxserver_testing -c ''create extension postgis;''; fi'
install:
# test with various Django versions
- pip install Django==$DJANGO
- pip install "django${DJANGO}"
- django-admin.py --version
# patch Django 1.4 libgeos
- 'if [ $DJANGO == "1.4.13" ]; then find /home/travis/virtualenv/ -name libgeos.py -exec patch {} jenkins/geos-dev.patch \; ; fi'
- 'if [ $DJANGO == ">=1.4,<1.5" ]; then find /home/travis/virtualenv/ -name libgeos.py -exec patch {} jenkins/geos-dev.patch \; ; fi'
# actually install EOxServer
- pip install .
- export XML_CATALOG_FILES="`pwd`/schemas/catalog.xml"
Expand Down
2 changes: 1 addition & 1 deletion autotest

0 comments on commit 36da39e

Please sign in to comment.