Skip to content

Commit b81f847

Browse files
Update the travis matrix to get closer to passing tests.
1 parent 154b663 commit b81f847

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ python:
33
- "2.6"
44
- "2.7"
55
env:
6-
- DJANGO=Django==1.3.3
76
- DJANGO=Django==1.4.1
87
- DJANGO=Django==1.5
8+
- DJANGO=Django==1.6
9+
- DJANGO=Django==1.7
910
- DJANGO=https://github.com/django/django/archive/master.zip
1011
matrix:
1112
include:
@@ -16,8 +17,10 @@ matrix:
1617
exclude:
1718
- python: "2.6"
1819
env: DJANGO=https://github.com/django/django/archive/master.zip
20+
- python: "2.6"
21+
env: DJANGO=Django==1.7
1922
install:
20-
- pip install south
23+
- if [ $DJANGO = 'Django==1.4.1' -o $DJANGO = 'Django==1.5' -o $DJANGO = 'Django==1.6' ]; then pip install south; fi
2124
- pip install $DJANGO
2225
- pip install -e .
2326
script:

runtests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ django_test() {
3333
}
3434

3535
django_test 'django-admin.py test --settings=testapp.settings' '2' 'normal settings'
36-
if [ "$DJANGO" != "https://github.com/django/django/archive/master.zip" ]
36+
if [ $DJANGO = 'Django==1.4.1' -o $DJANGO = 'Django==1.5' -o $DJANGO = 'Django==1.6' ]
3737
then
3838
django_test 'django-admin.py test --settings=testapp.settings_with_south' '2' 'with south in installed apps'
3939
fi

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
setup(
88
name='django-nose',
9-
version='1.2',
9+
version='1.7',
1010
description='Makes your Django tests simple and snappy',
1111
long_description=open(os.path.join(ROOT, 'README.rst')).read(),
1212
author='Jeff Balogh',

0 commit comments

Comments
 (0)