- updated to django 1.4.5

- fixed travis

Author: saxix

.travis.yml

@@ -8,8 +8,8 @@ python:
   - "3.2"
 env:
 #  - DJANGO="Django==1.4.3" DBENGINE=sqlite
-  - DJANGO="Django==1.4.3" DBENGINE=mysql
-  - DJANGO="Django==1.4.3" DBENGINE=pg
+  - DJANGO="Django==1.4.5" DBENGINE=mysql
+  - DJANGO="Django==1.4.5" DBENGINE=pg
 #  - DJANGO=https://www.djangoproject.com/download/1.5c1/tarball/ DBENGINE=mysql
   - DJANGO=https://www.djangoproject.com/download/1.5c1/tarball/ DBENGINE=pg
   - DJANGO=https://www.djangoproject.com/download/1.5c1/tarball/ DBENGINE=sqlite

concurrency/tests/contrib_admin.py

@@ -69,7 +69,7 @@ class TestDjangoAdmin(DjangoAdminTestCase):
 
     def test_creation(self):
         url = reverse('admin:concurrency_testmodel0_add')
-        data = {'username': u'new_username',
+        data = {'username': 'new_username',
                 'last_name': None,
                 'version': VersionFieldSigner().sign(0),
                 'char_field': None,

concurrency/tests/middleware.py

@@ -52,7 +52,7 @@ def test_stack(self):
         copy = TestModel0.objects.get(pk=m.pk)
         url = reverse('admin:concurrency_testmodel0_change', args=[m.pk])
 
-        data = {'username': u'new_username',
+        data = {'username': 'new_username',
                 'last_name': None,
                 'version': VersionFieldSigner().sign(m.version),
                 'char_field': None,

tox.ini

@@ -9,13 +9,12 @@ commands =
     django-admin.py test concurrency --settings concurrency.tests.settings --failfast --traceback
 
 setenv =
-    PYTHONPATH = /data/VENV/LIB/django/$DJANGOVERSION:$PYTHONPATH:
-
+    PYTHONPATH = /data/VENV/LIB/django/$DJANGOVERSION:$PYTHONPATH
 
 [testenv:dj14]
 basepython = python2.7
 setenv =
-    DJANGOVERSION = 1.4.3
+    DJANGOVERSION = 1.4.5
 deps =
     -r{toxinidir}/requirements.pip