Skip to content

Commit b3986ba

Browse files
author
Alexandr Shurigin
committed
Merge pull request #5 from Sinkler/travis
Updated travis for Django 1.9
2 parents 5aea6f5 + e014345 commit b3986ba

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ env:
99
- DJANGO=1.6
1010
- DJANGO=1.7
1111
- DJANGO=1.8
12+
- DJANGO=1.9
1213
install:
1314
- pip install -q Django==$DJANGO
1415
script:
@@ -21,3 +22,6 @@ matrix:
2122

2223
- python: "2.6"
2324
env: DJANGO=1.8
25+
26+
- python: "2.6"
27+
env: DJANGO=1.9

tests/urls.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
import sys
12
import uuid
23

34
from django.conf.urls import include
4-
from django.utils import unittest
5+
6+
if sys.version_info >= (2, 7):
7+
import unittest
8+
else:
9+
from django.utils import unittest
510

611
from macrosurl import MacroUrlPattern, url
712

0 commit comments

Comments
 (0)