aboutsummaryrefslogtreecommitdiffstats
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorTom Christie2014-12-03 23:11:04 +0000
committerTom Christie2014-12-03 23:11:04 +0000
commitaf23ec36bbf4ccb8f4179e790b49b11677ccf6ee (patch)
tree7ea80a203cc8718150cd55e4403f3f4771160281 /tests/conftest.py
parent3a5b3772fefc3c2f2c0899947cbc07bfe6e6b5d2 (diff)
parent0cc990792c63caa8fa8fea62cea53b0d28157b55 (diff)
downloaddjango-rest-framework-af23ec36bbf4ccb8f4179e790b49b11677ccf6ee.tar.bz2
Merge branch 'jpadilla-oauth_as_package' into version-3.1
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py20
1 files changed, 0 insertions, 20 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 31142eaf..44ed070b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -44,26 +44,6 @@ def pytest_configure():
),
)
- try:
- import oauth_provider # NOQA
- import oauth2 # NOQA
- except ImportError:
- pass
- else:
- settings.INSTALLED_APPS += (
- 'oauth_provider',
- )
-
- try:
- import provider # NOQA
- except ImportError:
- pass
- else:
- settings.INSTALLED_APPS += (
- 'provider',
- 'provider.oauth2',
- )
-
# guardian is optional
try:
import guardian # NOQA