Merge branch 'restframework2' into rest-framework-2-merge2.0.0

Conflicts:
	.gitignore
	.travis.yml
	AUTHORS
	README.rst
	djangorestframework/mixins.py
	djangorestframework/renderers.py
	djangorestframework/resources.py
	djangorestframework/serializer.py
	djangorestframework/templates/djangorestframework/base.html
	djangorestframework/templates/djangorestframework/login.html
	djangorestframework/templatetags/add_query_param.py
	djangorestframework/tests/accept.py
	djangorestframework/tests/authentication.py
	djangorestframework/tests/content.py
	djangorestframework/tests/reverse.py
	djangorestframework/tests/serializer.py
	djangorestframework/views.py
	docs/examples.rst
	docs/examples/blogpost.rst
	docs/examples/modelviews.rst
	docs/examples/objectstore.rst
	docs/examples/permissions.rst
	docs/examples/pygments.rst
	docs/examples/views.rst
	docs/howto/alternativeframeworks.rst
	docs/howto/mixin.rst
	docs/howto/reverse.rst
	docs/howto/usingurllib2.rst
	docs/index.rst
	docs/topics/release-notes.md
	examples/sandbox/views.py
	rest_framework/__init__.py
	rest_framework/compat.py
	rest_framework/utils/breadcrumbs.py
	setup.py

1 files changed, 21 insertions, 274 deletions

diff --git a/tox.ini b/tox.ini
index 8c3af256..bcfff672 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,283 +1,30 @@
-#This file is very NON-DRY because tox currently doesn't support interpolation like configparser does.
-#There's a ticket covering this at http://code.google.com/p/pytox/issues/detail?id=17#c0
-
 [tox]
-envlist=
-    py25-django12,
-    py26-django12,
-    py27-django12,
-    py25-django13,
-    py26-django13,
-    py27-django13,
-    py25-django14a1,
-    py26-django14a1,
-    py27-django14a1,
-    py25-django12-examples,
-    py26-django12-examples,
-    py27-django12-examples,
-    py25-django13-examples,
-    py26-django13-examples,
-    py27-django13-examples,
-    py25-django14a1-examples,
-    py26-django14a1-examples,
-    py27-django14a1-examples
-
-########################################### CORE TESTS ############################################
+downloadcache = {toxworkdir}/cache/
+envlist = py2.7-django1.5,py2.7-django1.4,py2.7-django1.3,py2.6-django1.5,py2.6-django1.4,py2.6-django1.3
 
 [testenv]
-commands=
-    python setup.py test
-
-[testenv:py25-django12]
-basepython=python2.5
-deps=
-    django==1.2.4
-    django-staticfiles>=1.1.2
-    coverage==3.4
-    URLObject>=0.6.0
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-    # Optional packages:    
-    markdown
-
-[testenv:py26-django12]
-basepython=python2.6
-deps=
-    django==1.2.4
-    django-staticfiles>=1.1.2
-    coverage==3.4
-    URLObject>=0.6.0
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-    # Optional packages:    
-    markdown
-
-[testenv:py27-django12]
-basepython=python2.7
-deps=
-    django==1.2.4
-    django-staticfiles>=1.1.2
-    coverage==3.4
-    URLObject>=0.6.0
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-    # Optional packages:    
-    markdown
-
-[testenv:py25-django13]
-basepython=python2.5
-deps=
-    django==1.3
-    coverage==3.4
-    URLObject>=0.6.0
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-    # Optional packages:
-    markdown
-
-[testenv:py26-django13]
-basepython=python2.6
-deps=
-    django==1.3
-    coverage==3.4
-    URLObject>=0.6.0
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-    # Optional packages:    
-    markdown
-
-[testenv:py27-django13]
-basepython=python2.7
-deps=
-    django==1.3
-    coverage==3.4
-    URLObject>=0.6.0
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-    # Optional packages:
-    markdown	
-
-[testenv:py25-django14a1]
-basepython=python2.5
-deps=
-    http://www.djangoproject.com/download/1.4-alpha-1/tarball/
-    coverage==3.4
-    URLObject>=0.6.0
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-    # Optional packages:
-    markdown
+commands = {envpython} rest_framework/runtests/runtests.py
 
-[testenv:py26-django14a1]
-basepython=python2.6
-deps=
-    http://www.djangoproject.com/download/1.4-alpha-1/tarball/
-    coverage==3.4
-    URLObject>=0.6.0
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-    # Optional packages:    
-    markdown
+[testenv:py2.7-django1.5]
+basepython = python2.7
+deps = https://github.com/django/django/zipball/master
 
-[testenv:py27-django14a1]
-basepython=python2.7
-deps=
-    http://www.djangoproject.com/download/1.4-alpha-1/tarball/
-    coverage==3.4
-    URLObject>=0.6.0
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-    # Optional packages:
-    markdown	
+[testenv:py2.7-django1.4]
+basepython = python2.7
+deps = django==1.4.1
 
-####################################### EXAMPLES ################################################
-    
-[testenv:py25-django12-examples]
-basepython=python2.5
-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
-    Pygments==1.4
-    httplib2==0.6.0
-    Markdown==2.0.3
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-	
-[testenv:py26-django12-examples]
-basepython=python2.6
-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
-    Pygments==1.4
-    httplib2==0.6.0
-    Markdown==2.0.3
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-	
-[testenv:py27-django12-examples]
-basepython=python2.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
-    Pygments==1.4
-    httplib2==0.6.0
-    Markdown==2.0.3
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-	
-[testenv:py25-django13-examples]
-basepython=python2.5
-commands=
-	python examples/runtests.py
-deps=
-    django==1.3
-    coverage==3.4
-    URLObject>=0.6.0
-    wsgiref==0.1.2
-    Pygments==1.4
-    httplib2==0.6.0
-    Markdown==2.0.3
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-	
-[testenv:py26-django13-examples]
-basepython=python2.6
-commands=
-	python examples/runtests.py
-deps=
-    django==1.3
-    coverage==3.4
-    URLObject>=0.6.0
-    wsgiref==0.1.2
-    Pygments==1.4
-    httplib2==0.6.0
-    Markdown==2.0.3
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-	
-[testenv:py27-django13-examples]
-basepython=python2.7
-commands=
-	python examples/runtests.py
-deps=
-    django==1.3
-    coverage==3.4
-    URLObject>=0.6.0
-    wsgiref==0.1.2
-    Pygments==1.4
-    httplib2==0.6.0
-    Markdown==2.0.3
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
+[testenv:py2.7-django1.3]
+basepython = python2.7
+deps = django==1.3.3
 
-[testenv:py25-django14a1-examples]
-basepython=python2.5
-commands=
-	python examples/runtests.py
-deps=
-    http://www.djangoproject.com/download/1.4-alpha-1/tarball/
-    coverage==3.4
-    URLObject>=0.6.0
-    wsgiref==0.1.2
-    Pygments==1.4
-    httplib2==0.6.0
-    Markdown==2.0.3
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-	
-[testenv:py26-django14a1-examples]
-basepython=python2.6
-commands=
-	python examples/runtests.py
-deps=
-    http://www.djangoproject.com/download/1.4-alpha-1/tarball/
-    coverage==3.4
-    URLObject>=0.6.0
-    wsgiref==0.1.2
-    Pygments==1.4
-    httplib2==0.6.0
-    Markdown==2.0.3
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
-	
-[testenv:py27-django14a1-examples]
-basepython=python2.7
-commands=
-	python examples/runtests.py
-deps=
-    http://www.djangoproject.com/download/1.4-alpha-1/tarball/
-    coverage==3.4
-    URLObject>=0.6.0
-    wsgiref==0.1.2
-    Pygments==1.4
-    httplib2==0.6.0
-    Markdown==2.0.3
-    unittest-xml-reporting==1.2
-    Pyyaml==3.10
+[testenv:py2.6-django1.5]
+basepython = python2.6
+deps = https://github.com/django/django/zipball/master
 
-##########################################DOCS#################################################
+[testenv:py2.6-django1.4]
+basepython = python2.6
+deps = django==1.4.1
 
-[testenv:docs]
-basepython=python
-changedir=docs
-deps=
-    sphinx
-    pytest
-    django==1.3
-commands=
-    py.test --tb=line -v --junitxml=junit-{envname}.xml check_sphinx.py
+[testenv:py2.6-django1.3]
+basepython = python2.6
+deps = django==1.3.3