Merge branch 'master' into no-1.8-10

mblayman · mblayman · commit ab71b7f56d8c · 2017-12-03T16:22:07.000-05:00
diff --git a/setup.py b/setup.py
@@ -100,6 +100,7 @@ def get_package_data(package):
         'inflection>=0.3.0',
         'djangorestframework>=3.6.3',
         'django>=1.11',
+        'six',
     ],
     setup_requires=pytest_runner + sphinx + wheel,
     tests_require=[
