From 886d909a9aa214ed04b8583eefd5fcce842ebd3b Mon Sep 17 00:00:00 2001 From: Jacob Date: Mon, 9 Oct 2017 23:36:46 -0500 Subject: [PATCH 1/2] Pin drf to < 3.7, fixes failing tests --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2361492..fa8c65b 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ with open('graphene_django/__init__.py', 'rb') as f: f.read().decode('utf-8')).group(1))) rest_framework_require = [ - 'djangorestframework>=3.6.3', + 'djangorestframework>=3.6.3,<3.7.0', ] From 768fca668da3ce462100cc62827051f76899ea80 Mon Sep 17 00:00:00 2001 From: Jacob Date: Mon, 9 Oct 2017 23:55:11 -0500 Subject: [PATCH 2/2] Trying conditional build install override --- .travis.yml | 3 +++ setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 578ebf8..ef8a3d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,9 @@ install: pip install -e .[test] pip install psycopg2 # Required for Django postgres fields testing pip install django==$DJANGO_VERSION + if [ $DJANGO_VERSION = 1.8 ]; then # DRF dropped 1.8 support at 3.7.0 + pip install djangorestframework==3.6.4 + fi python setup.py develop elif [ "$TEST_TYPE" = lint ]; then pip install flake8 diff --git a/setup.py b/setup.py index fa8c65b..2361492 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ with open('graphene_django/__init__.py', 'rb') as f: f.read().decode('utf-8')).group(1))) rest_framework_require = [ - 'djangorestframework>=3.6.3,<3.7.0', + 'djangorestframework>=3.6.3', ]