From a691e9e97c8a3086b15648a579c6576c8b62f289 Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Sun, 29 Jan 2017 13:46:23 +0100
Subject: [PATCH] Fixed Django 2.0 tests due to `django.conf.urls.include`
 behavior change. Removed pypy for Django 2.0 tests.

---
 .travis.yml   | 2 --
 tests/urls.py | 2 +-
 tox.ini       | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a0ab057..f40db5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,14 +20,12 @@ env:
   - TOXENV=pypy-django-19
   - TOXENV=pypy-django-110
   - TOXENV=pypy-django-111
-  - TOXENV=pypy-django-master
 matrix:
   allow_failures:
     - env: TOXENV=py27-django-111
     - env: TOXENV=py35-django-111
     - env: TOXENV=pypy-django-111
     - env: TOXENV=py35-django-master
-    - env: TOXENV=pypy-django-master
 script:
 - tox
 deploy:
diff --git a/tests/urls.py b/tests/urls.py
index 12fe50c..1076a94 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -4,5 +4,5 @@ from django.conf.urls import url, include
 
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 ]
diff --git a/tox.ini b/tox.ini
index 524e5f3..ab04443 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     {py27,py35,pypy}-django-{18,19,110,111}
-    {py35,pypy}-django-master
+    {py35}-django-master
 
 [testenv]
 basepython =