From 971578ca345c3d3bae7fd93b87c41d43483b6f05 Mon Sep 17 00:00:00 2001
From: Andreas Pelme
Date: Sun, 2 Mar 2014 12:40:30 +0100
Subject: Support for running the test suite with py.test

 * Get rid of runtests.py
 * Moved test code  from rest_framework/tests and rest_framework/runtests to tests
 * Invoke py.test from setup.py
 * Invoke py.test from Travis
 * Invoke py.test from tox
 * Changed setUpClass to be just plain setUp in test_permissions.py
 * Updated contribution guideline to show how to invoke py.test
---
 tests/urls.py | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 tests/urls.py

(limited to 'tests/urls.py')

diff --git a/tests/urls.py b/tests/urls.py
new file mode 100644
index 00000000..62cad339
--- /dev/null
+++ b/tests/urls.py
@@ -0,0 +1,6 @@
+"""
+Blank URLConf just to keep the test suite happy
+"""
+from rest_framework.compat import patterns
+
+urlpatterns = patterns('')
-- 
cgit v1.2.3


From e5441d845e34f1e1bb2b7464d31aa3df7b02d0fe Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 1 May 2014 08:41:37 +0200
Subject: Use urls functions from django instead of compat.

---
 tests/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/urls.py')

diff --git a/tests/urls.py b/tests/urls.py
index 62cad339..41f527df 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,6 +1,6 @@
 """
 Blank URLConf just to keep the test suite happy
 """
-from rest_framework.compat import patterns
+from django.conf.urls import patterns
 
 urlpatterns = patterns('')
-- 
cgit v1.2.3