From b2fcfffb3bdaed89d39ee563c58dc0ede5e857ac Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 31 Jan 2012 09:05:52 +0000 Subject: [PATCH] django-staticfiles for Django 1.2 compatability --- djangorestframework/runtests/settings.py | 6 ++++++ tox.ini | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/djangorestframework/runtests/settings.py b/djangorestframework/runtests/settings.py index 07855fa7a..25f771114 100644 --- a/djangorestframework/runtests/settings.py +++ b/djangorestframework/runtests/settings.py @@ -97,6 +97,12 @@ INSTALLED_APPS = ( 'djangorestframework', ) +import django + +if django.VERSION < (1, 3): + INSTALLED_APPS += ('staticfiles',) + + # OAuth support is optional, so we only test oauth if it's installed. try: import oauth_provider diff --git a/tox.ini b/tox.ini index 7601cd02d..8c3af2567 100644 --- a/tox.ini +++ b/tox.ini @@ -32,9 +32,9 @@ commands= basepython=python2.5 deps= django==1.2.4 + django-staticfiles>=1.1.2 coverage==3.4 URLObject>=0.6.0 - django-staticfiles>=1.1.2 unittest-xml-reporting==1.2 Pyyaml==3.10 # Optional packages: @@ -44,9 +44,9 @@ deps= basepython=python2.6 deps= django==1.2.4 + django-staticfiles>=1.1.2 coverage==3.4 URLObject>=0.6.0 - django-staticfiles>=1.1.2 unittest-xml-reporting==1.2 Pyyaml==3.10 # Optional packages: @@ -56,9 +56,9 @@ deps= basepython=python2.7 deps= django==1.2.4 + django-staticfiles>=1.1.2 coverage==3.4 URLObject>=0.6.0 - django-staticfiles>=1.1.2 unittest-xml-reporting==1.2 Pyyaml==3.10 # Optional packages: @@ -138,6 +138,7 @@ commands= python examples/runtests.py deps= django==1.2.4 + django-staticfiles>=1.1.2 coverage==3.4 URLObject>=0.6.0 wsgiref==0.1.2 @@ -153,6 +154,7 @@ commands= python examples/runtests.py deps= django==1.2.4 + django-staticfiles>=1.1.2 coverage==3.4 URLObject>=0.6.0 wsgiref==0.1.2 @@ -168,6 +170,7 @@ commands= python examples/runtests.py deps= django==1.2.4 + django-staticfiles>=1.1.2 coverage==3.4 URLObject>=0.6.0 wsgiref==0.1.2