Skip to content

Commit

Permalink
[Travis] Django 1.8 testing, remove unneeded lines
Browse files Browse the repository at this point in the history
We allow 1.8 to fail as it's not currently out.
  • Loading branch information
dracos committed Feb 11, 2015
1 parent b19f2f9 commit 9af2b53
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,22 @@ env:
- MODULES="Django>=1.5,<1.6"
- MODULES="Django>=1.6,<1.7"
- MODULES="Django>=1.7,<1.8"
- MODULES="git+https://github.com/django/django.git@stable/1.8.x#egg=django"

# Django 1.4 did not support Python 3.
matrix:
exclude:
- python: "3.2"
env: MODULES="Django>=1.4,<1.5"
allow_failures:
- env: MODULES="git+https://github.com/django/django.git@stable/1.8.x#egg=django"

install:
- sudo rm /etc/apt/sources.list.d/ubuntugis-stable-source.list
- sudo apt-get update -qq
- sudo apt-get install -qq python-gdal gdal-bin binutils
- ln -s /usr/lib/python2.7/dist-packages/osgeo ~/virtualenv/python2.7/lib/python2.7/site-packages/
- ln -s /usr/lib/python2.7/dist-packages/GDAL-1.7.3.egg-info ~/virtualenv/python2.7/lib/python2.7/site-packages/
- pip install $MODULES --use-mirrors
- pip install -r requirements.txt --use-mirrors

This comment has been minimized.

Copy link
@mhl

mhl Feb 12, 2015

Contributor

Why is the symlinking-in of GDAL and osgeo no longer required? (This sounds like it might be good news :))

This comment has been minimized.

Copy link
@dracos

dracos Feb 12, 2015

Author Member

It appears not for a while - the build looks to be installing GDAL 1.9, so symlinking in 1.7 probably wasn't doing much… python-gdal (osgeo) is optional in MapIt now, it's only used to turn on exceptions if it's present anyway, so it wouldn't have noticed. But for whatever reason (I gave up trying to work it out) leaving these lines in caused Django 1.8 on Python 2.7 only to fail saying the import test couldn't open a KML file.

- sudo apt-get install -qq gdal-bin binutils
- pip install $MODULES
- pip install -r requirements.txt
# The below is for Django 1.4 compatibility. If you don't need that, you could
# just do the before_script step commented out below.
- createdb -E UTF8 template_postgis &&
Expand Down

0 comments on commit 9af2b53

Please sign in to comment.