From 9a5a6527cc54bcbd2c98e18f0fb1bb6d0f1448b6 Mon Sep 17 00:00:00 2001 From: Anton Shurashov Date: Thu, 24 Mar 2016 21:57:39 +0300 Subject: [PATCH 1/4] updated travis for django 1.9 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9ac0102..ab2f5f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ env: - DJANGO=1.6 - DJANGO=1.7 - DJANGO=1.8 + - DJANGO=1.9 install: - pip install -q Django==$DJANGO script: @@ -21,3 +22,6 @@ matrix: - python: "2.6" env: DJANGO=1.8 + + - python: "2.6" + env: DJANGO=1.9 From 635e0a5bb1756ab5341eedb0ca4a5894d9a6e360 Mon Sep 17 00:00:00 2001 From: Anton Shurashov Date: Thu, 24 Mar 2016 22:17:32 +0300 Subject: [PATCH 2/4] fixed import unittest for django 1.9 --- tests/urls.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/urls.py b/tests/urls.py index 99da77f..1726a8b 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -1,7 +1,11 @@ import uuid +from django import VERSION from django.conf.urls import include -from django.utils import unittest +if VERSION < (1, 8): + from django.utils import unittest +else: + import unittest from macrosurl import MacroUrlPattern, url From 164125698605fa70fb7f5cf11db771ce9128213a Mon Sep 17 00:00:00 2001 From: Anton Shurashov Date: Thu, 24 Mar 2016 22:19:26 +0300 Subject: [PATCH 3/4] fixed import unittest for django 1.9 --- tests/urls.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/urls.py b/tests/urls.py index 1726a8b..d35b2aa 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -1,11 +1,7 @@ import uuid +import unittest -from django import VERSION from django.conf.urls import include -if VERSION < (1, 8): - from django.utils import unittest -else: - import unittest from macrosurl import MacroUrlPattern, url From e01434503d1df20129a4012e172cba049fa5d9bb Mon Sep 17 00:00:00 2001 From: Anton Shurashov Date: Thu, 24 Mar 2016 22:27:57 +0300 Subject: [PATCH 4/4] fixed import unittest for python 2.6 --- tests/urls.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/urls.py b/tests/urls.py index d35b2aa..b1e7ac6 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -1,8 +1,13 @@ +import sys import uuid -import unittest from django.conf.urls import include +if sys.version_info >= (2, 7): + import unittest +else: + from django.utils import unittest + from macrosurl import MacroUrlPattern, url