encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-03-25 04:14:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

django-staticfiles for Django 1.2 compatability

Browse Source
This commit is contained in:
Tom Christie 2012-01-31 09:05:52 +00:00
parent 497d6df5e5
commit b2fcfffb3b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
djangorestframework/runtests/settings.py
View File

@ -97,6 +97,12 @@ INSTALLED_APPS = (
'djangorestframework', 'djangorestframework',
) )
import django
if django.VERSION < (1, 3):
INSTALLED_APPS += ('staticfiles',)
# OAuth support is optional, so we only test oauth if it's installed. # OAuth support is optional, so we only test oauth if it's installed.
try: try:
import oauth_provider import oauth_provider

9
tox.ini
View File

@ -32,9 +32,9 @@ commands=
basepython=python2.5 basepython=python2.5
deps= deps=
django==1.2.4 django==1.2.4
django-staticfiles>=1.1.2
coverage==3.4 coverage==3.4
URLObject>=0.6.0 URLObject>=0.6.0
django-staticfiles>=1.1.2
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
# Optional packages: # Optional packages:
@ -44,9 +44,9 @@ deps=
basepython=python2.6 basepython=python2.6
deps= deps=
django==1.2.4 django==1.2.4
django-staticfiles>=1.1.2
coverage==3.4 coverage==3.4
URLObject>=0.6.0 URLObject>=0.6.0
django-staticfiles>=1.1.2
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
# Optional packages: # Optional packages:
@ -56,9 +56,9 @@ deps=
basepython=python2.7 basepython=python2.7
deps= deps=
django==1.2.4 django==1.2.4
django-staticfiles>=1.1.2
coverage==3.4 coverage==3.4
URLObject>=0.6.0 URLObject>=0.6.0
django-staticfiles>=1.1.2
unittest-xml-reporting==1.2 unittest-xml-reporting==1.2
Pyyaml==3.10 Pyyaml==3.10
# Optional packages: # Optional packages:
@ -138,6 +138,7 @@ commands=
python examples/runtests.py python examples/runtests.py
deps= deps=
django==1.2.4 django==1.2.4
django-staticfiles>=1.1.2
coverage==3.4 coverage==3.4
URLObject>=0.6.0 URLObject>=0.6.0
wsgiref==0.1.2 wsgiref==0.1.2
@ -153,6 +154,7 @@ commands=
python examples/runtests.py python examples/runtests.py
deps= deps=
django==1.2.4 django==1.2.4
django-staticfiles>=1.1.2
coverage==3.4 coverage==3.4
URLObject>=0.6.0 URLObject>=0.6.0
wsgiref==0.1.2 wsgiref==0.1.2
@ -168,6 +170,7 @@ commands=
python examples/runtests.py python examples/runtests.py
deps= deps=
django==1.2.4 django==1.2.4
django-staticfiles>=1.1.2
coverage==3.4 coverage==3.4
URLObject>=0.6.0 URLObject>=0.6.0
wsgiref==0.1.2 wsgiref==0.1.2