Fixes related to travis tests compatibility

darklow · Aug 9, 2016 · cf3e710 · cf3e710
1 parent f2397bc
commit cf3e710
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 python:
   - 2.6
   - 2.7
-  - 3.3
   - 3.4
   - pypy
 env:
@@ -23,16 +22,18 @@ script:
 matrix:
   exclude:
     # Django doesn't support following combinations
-    - python: 3.3
-      env: DJANGO=1.4.20
     - python: 3.4
       env: DJANGO=1.4.20
     - python: 2.6
       env: DJANGO=1.6.11
     - python: 2.6
-      env: DJANGO=1.7.7
+      env: DJANGO=1.7.11
+    - python: 2.6
+      env: DJANGO=1.8.14
+    - python: 2.6
+      env: DJANGO=1.9.9
     - python: 2.6
-      env: DJANGO=1.8.3
+      env: DJANGO=1.10
     - python: pypy
       env: DJANGO=1.4.20
     - python: pypy

diff --git a/suit/tests/settings.py b/suit/tests/settings.py
@@ -55,9 +55,9 @@
 
 from django.conf.global_settings import TEMPLATE_CONTEXT_PROCESSORS as TCP
 
-TEMPLATE_CONTEXT_PROCESSORS = TCP + (
+TEMPLATE_CONTEXT_PROCESSORS = list(TCP) + [
     'django.core.context_processors.request',
-)
+]
 
 SUIT_CONFIG = {}
 TEST_RUNNER = 'suit.tests.SuitTestRunner'