Skip to content

Commit

Permalink
add Django develop to testsuite
Browse files Browse the repository at this point in the history
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 f1f802d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ python:
install: install:
- ./.travis_setup - ./.travis_setup
env: env:
- DJANGO_VERSION=1.3.1 - DJANGO="django>=1.3,<1.4"
- DJANGO_VERSION=1.4 - DJANGO="django>=1.4,<1.5"
- DJANGO="-e git+git://github.com/django/django.git#egg=Django"
script: python setup.py test script: python setup.py test
matrix: matrix:
allow_failures: allow_failures:
- env: DJANGO_VERSION=1.4 - env: DJANGO="-e git+git://github.com/django/django.git#egg=Django"
2 changes: 1 addition & 1 deletion .travis_setup
Original file line number Original file line Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
pip install Django==$DJANGO_VERSION PIL django-staticfiles pip install $DJANGO PIL
7 changes: 5 additions & 2 deletions runtests.sh
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -46,10 +46,13 @@ esac
find . -name '*.pyc' -delete find . -name '*.pyc' -delete


if [ $django == "13" ]; then if [ $django == "13" ]; then
export DJANGO_VERSION="1.3.1" export DJANGO="django>=1.3,<1.4"
fi fi
if [ $django == "14" ]; then 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 fi


./.travis_setup ./.travis_setup
Expand Down
2 changes: 2 additions & 0 deletions test_settings.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@
MEDIA_ROOT = os.path.abspath( os.path.join(TMP_ROOT, 'media') ) MEDIA_ROOT = os.path.abspath( os.path.join(TMP_ROOT, 'media') )
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
STATIC_URL = '/static/' 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.