From 5829a221fd1967fa1ffb803da51ca8f4d1ecfb6f Mon Sep 17 00:00:00 2001 From: Bojan Mihelac Date: Tue, 8 May 2012 12:37:09 +0200 Subject: [PATCH 1/2] Add SECRET_KEY in test_settings. Django 1.4. requires it. --- compressor/test_settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compressor/test_settings.py b/compressor/test_settings.py index 1fa4ad9..0f4843a 100644 --- a/compressor/test_settings.py +++ b/compressor/test_settings.py @@ -39,3 +39,5 @@ JENKINS_TASKS = ( 'django_jenkins.tasks.with_coverage', 'django_jenkins.tasks.django_tests', ) + +SECRET_KEY = "iufoj=mibkpdz*%bob952x(%49rqgv8gg45k36kjcg76&-y5=!" From 7371006e0e2eedfa859b1a184cc65b19fa501cc4 Mon Sep 17 00:00:00 2001 From: Bojan Mihelac Date: Tue, 8 May 2012 12:38:48 +0200 Subject: [PATCH 2/2] Use released Django --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 2fb3d2c..8747750 100644 --- a/tox.ini +++ b/tox.ini @@ -48,16 +48,16 @@ deps = basepython = python2.5 deps = {deps$base} - https://github.com/django/django/zipball/master + Django==1.4 [testenv:py26-1.4.X] basepython = python2.6 deps = {deps$base} - https://github.com/django/django/zipball/master + Django==1.4 [testenv:py27-1.4.X] basepython = python2.7 deps = {deps$base} - https://github.com/django/django/zipball/master + Django==1.4