Permalink
Browse files

add Django develop to testsuite

also fix a small issue with easy-thumbnails 1.0.3 and django 1.3
  • Loading branch information...
stefanfoulis committed Jul 7, 2012
1 parent 223a18a commit f1f802dd171d9f5a3eaee1ef4df69d3ad08c2f2a
Showing with 12 additions and 6 deletions.
  1. +4 −3 .travis.yml
  2. +1 −1 .travis_setup
  3. +5 −2 runtests.sh
  4. +2 −0 test_settings.py
View
@@ -5,9 +5,10 @@ python:
install:
- ./.travis_setup
env:
- - DJANGO_VERSION=1.3.1
- - DJANGO_VERSION=1.4
+ - DJANGO="django>=1.3,<1.4"
+ - DJANGO="django>=1.4,<1.5"
+ - DJANGO="-e git+git://github.com/django/django.git#egg=Django"
script: python setup.py test
matrix:
allow_failures:
- - env: DJANGO_VERSION=1.4
+ - env: DJANGO="-e git+git://github.com/django/django.git#egg=Django"
View
@@ -1,2 +1,2 @@
#!/bin/bash
-pip install Django==$DJANGO_VERSION PIL django-staticfiles
+pip install $DJANGO PIL
View
@@ -46,10 +46,13 @@ esac
find . -name '*.pyc' -delete
if [ $django == "13" ]; then
- export DJANGO_VERSION="1.3.1"
+ export DJANGO="django>=1.3,<1.4"
fi
if [ $django == "14" ]; then
- export DJANGO_VERSION="1.4"
+ export DJANGO="django>=1.4,<1.5"
+fi
+if [ $django == "dev" ]; then
+ export DJANGO="-e git+git://github.com/django/django.git#egg=Django"
fi
./.travis_setup
View
@@ -25,3 +25,5 @@
MEDIA_ROOT = os.path.abspath( os.path.join(TMP_ROOT, 'media') )
MEDIA_URL = '/media/'
STATIC_URL = '/static/'
+
+USE_TZ = False # because of a bug in easy-thumbnails 1.0.3

0 comments on commit f1f802d

Please sign in to comment.