Skip to content
Browse files

Merge pull request #168 from mbraak/dev

Thanks Marco!
  • Loading branch information...
2 parents bfc4087 + d6b43ce commit 8c192ca0fbc3aa88ce26b211ed51482af1ea1162 @dbunskoek dbunskoek committed Feb 27, 2013
Showing with 11 additions and 12 deletions.
  1. +5 −6 .travis.yml
  2. +6 −6 testproject/tox.ini
View
11 .travis.yml
@@ -3,11 +3,11 @@ python:
- 2.6
- 2.7
env:
- - DJANGO_VERSION=1.3.5
- - DJANGO_VERSION=1.4.3
- - DJANGO_VERSION=1.5c1
+ - DJANGO_VERSION=1.3.7
+ - DJANGO_VERSION=1.4.5
+ - DJANGO_VERSION=1.5
install:
- - "if [[ $DJANGO_VERSION == '1.5c1' ]]; then pip install https://www.djangoproject.com/download/1.5c1/tarball/; else pip install Django==$DJANGO_VERSION; fi"
+ - pip install Django==$DJANGO_VERSION
- "pip install . --use-mirrors"
- "pip install -r testproject/requirements.txt --use-mirrors"
script:
@@ -17,5 +17,4 @@ script:
branches:
only:
- master
- - dev
- - tox
+ - dev
View
12 testproject/tox.ini
@@ -11,35 +11,35 @@ commands =
[testenv:django1.3-py26]
basepython = python2.6
deps =
- Django==1.3.5
+ Django==1.3.7
{[testenv]deps}
[testenv:django1.3-py27]
basepython = python2.7
deps =
- Django==1.3.5
+ Django==1.3.7
{[testenv]deps}
[testenv:django1.4-py26]
basepython = python2.6
deps =
- Django==1.4.3
+ Django==1.4.5
{[testenv]deps}
[testenv:django1.4-py27]
basepython = python2.7
deps =
- Django==1.4.3
+ Django==1.4.5
{[testenv]deps}
[testenv:django1.5-py26]
basepython = python2.6
deps =
- https://www.djangoproject.com/download/1.5c1/tarball/
+ Django==1.5
{[testenv]deps}
[testenv:django1.5-py27]
basepython = python2.7
deps =
- https://www.djangoproject.com/download/1.5c1/tarball/
+ Django==1.5
{[testenv]deps}

0 comments on commit 8c192ca

Please sign in to comment.
Something went wrong with that request. Please try again.