From 6909e92d22520fa9717507e9b9bd7db8601c17cd Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 18 Dec 2014 10:58:08 +0000
Subject: Drop 'setup.py test'. Just use 'runtests.py'.

---
 setup.py | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/setup.py b/setup.py
index 50bac046..1e54836c 100755
--- a/setup.py
+++ b/setup.py
@@ -8,20 +8,6 @@ import os
 import sys
 
 
-# This command has been borrowed from
-# https://github.com/getsentry/sentry/blob/master/setup.py
-class PyTest(TestCommand):
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = ['tests']
-        self.test_suite = True
-
-    def run_tests(self):
-        import pytest
-        errno = pytest.main(self.test_args)
-        sys.exit(errno)
-
-
 def get_version(package):
     """
     Return package version as listed in `__version__` in `init.py`.
@@ -80,7 +66,6 @@ setup(
     author_email='tom@tomchristie.com',  # SEE NOTE BELOW (*)
     packages=get_packages('rest_framework'),
     package_data=get_package_data('rest_framework'),
-    cmdclass={'test': PyTest},
     install_requires=[],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
-- 
cgit v1.2.3


From af0f04246204767312ee82219e4e44c9f9b6ea53 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 18 Dec 2014 11:53:11 +0000
Subject: Add pinned versions of wheels and mkdocs to our dev requirements.

---
 requirements.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/requirements.txt b/requirements.txt
index f282d3ba..48b29e61 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,3 +16,9 @@ django-filter>=0.5.4
 django-oauth-plus>=2.2.1
 oauth2>=1.5.211
 django-oauth2-provider>=0.2.4
+
+# wheel for PyPI installs
+wheel==0.24.0
+
+# MkDocs for documentation previews/deploys
+mkdocs==0.11.1
-- 
cgit v1.2.3


From a68d9331fcb0d461ee3dfd4e3e6cf9f0f6b7b988 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 18 Dec 2014 12:17:46 +0000
Subject: YAML encoder fix for 3.0 serializers.

---
 rest_framework/utils/encoders.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
index adc83e57..73cbe5d8 100644
--- a/rest_framework/utils/encoders.py
+++ b/rest_framework/utils/encoders.py
@@ -7,6 +7,7 @@ from django.utils import six, timezone
 from django.utils.encoding import force_text
 from django.utils.functional import Promise
 from rest_framework.compat import OrderedDict
+from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList
 import datetime
 import decimal
 import types
@@ -107,14 +108,14 @@ else:
         OrderedDict,
         yaml.representer.SafeRepresenter.represent_dict
     )
-    # SafeDumper.add_representer(
-    #     DictWithMetadata,
-    #     yaml.representer.SafeRepresenter.represent_dict
-    # )
-    # SafeDumper.add_representer(
-    #     OrderedDictWithMetadata,
-    #     yaml.representer.SafeRepresenter.represent_dict
-    # )
+    SafeDumper.add_representer(
+        ReturnDict,
+        yaml.representer.SafeRepresenter.represent_dict
+    )
+    SafeDumper.add_representer(
+        ReturnList,
+        yaml.representer.SafeRepresenter.represent_list
+    )
     SafeDumper.add_representer(
         types.GeneratorType,
         yaml.representer.SafeRepresenter.represent_list
-- 
cgit v1.2.3