From 1922dc6e73ecc926a1cd5b0972691e186d614ed3 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Wed, 22 Nov 2017 23:16:07 -0500 Subject: [PATCH 1/3] Update Django to 2.0rc1 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 7b78c0ba3..e2c7c2feb 100644 --- a/tox.ini +++ b/tox.ini @@ -24,7 +24,7 @@ setenv = deps = django110: Django>=1.10,<1.11 django111: Django>=1.11,<2.0 - django20: Django>=2.0b1,<2.1 + django20: Django>=2.0rc1,<2.1 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From bc28b0c74f435a2c9e3a724d552f32845cfb9c70 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Wed, 22 Nov 2017 23:16:23 -0500 Subject: [PATCH 2/3] Remove django 2.0 from allowable failures in CI --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 05309cd97..9c9ad7a4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,6 @@ matrix: allow_failures: - env: DJANGO=master - - env: DJANGO=2.0 install: - pip install tox tox-travis From 7a533cd8b8be156824ca8b1a8a1d540019ba4642 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Wed, 22 Nov 2017 23:21:00 -0500 Subject: [PATCH 3/3] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 350174555..ceac9e57c 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ There is a live example API for testing purposes, [available here][sandbox]. # Requirements * Python (2.7, 3.4, 3.5, 3.6) -* Django (1.10, 1.11, 2.0 alpha) +* Django (1.10, 1.11, 2.0rc1) # Installation