Merge branch 'feature/travis-django-matrix' into develop

Fantomas42 · Nov 8, 2013 · 621081a · 621081a
2 parents 26d0775 + a2d11c0
commit 621081a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,23 @@
 language: python
 python:
-    - "2.6"
-    - "2.7"
-    - "3.2"
-    - "3.3"
+    - 2.6
+    - 2.7
+    - 3.2
+    - 3.3
+env:
+    - DJANGO=1.4
+    - DJANGO=1.5
+    - DJANGO=1.6
 install:
     - pip install -U setuptools
     - python bootstrap.py
-    - ./bin/buildout
+    - ./bin/buildout versions:django=$DJANGO
+matrix:
+    exclude:
+        - python: 3.2
+          env: DJANGO=1.4
+        - python: 3.3
+          env: DJANGO=1.4
 before_script:
     - ./bin/flake8 app_namespace
 script:

diff --git a/app_namespace/loader.py b/app_namespace/loader.py
@@ -2,7 +2,8 @@
 import os
 import sys
 
-from django.utils import six
+import six
+
 from django.conf import settings
 from django.utils._os import safe_join
 from django.template.loader import BaseLoader

diff --git a/buildout.cfg b/buildout.cfg
@@ -6,7 +6,8 @@ parts                   = test
                           coveralls
                           evolution
 develop                 = .
-eggs                    = django
+eggs                    = six
+                          django
                           django-app-namespace-template-loader
 show-picked-versions    = true
 
@@ -45,7 +46,7 @@ eggs                    = python-coveralls
 recipe                  = zc.recipe.egg
 eggs                    = buildout-versions-checker
 scripts                 = check-buildout-updates=evolve
-arguments               = '-w --indent 32'
+arguments               = '-w'
 
 [testenv]
 DJANGO_SETTINGS_MODULE  = app_namespace.tests.settings
diff --git a/setup.py b/setup.py
@@ -41,5 +41,6 @@
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
         'License :: OSI Approved :: BSD License',
-        'Topic :: Software Development :: Libraries :: Python Modules']
+        'Topic :: Software Development :: Libraries :: Python Modules'],
+    install_requires=['six']
 )
diff --git a/versions.cfg b/versions.cfg
@@ -1,10 +1,10 @@
 [versions]
-Django                          = 1.5.4
+Django                          = 1.6
 Pygments                        = 1.6
 blessings                       = 1.5.1
-buildout-versions-checker       = 1.0
+buildout-versions-checker       = 1.1
 fancycompleter                  = 0.4
-flake8                          = 2.0
+flake8                          = 2.1.0
 futures                         = 2.1.4
 mccabe                          = 0.2.1
 nose-progressive                = 1.5
@@ -19,9 +19,9 @@ zc.buildout                     = 2.2.1
 zc.recipe.egg                   = 2.0.1
 PyYAML                          = 3.10
 argparse                        = 1.2.1
-coverage                        = 3.6
+coverage                        = 3.7
 nose                            = 1.3.0
-requests                        = 2.0.0
+requests                        = 2.0.1
 sh                              = 1.09
 six                             = 1.4.1
 wmctrl                          = 0.1