Skip to content
This repository was archived by the owner on May 26, 2020. It is now read-only.

Commit 97254ba

Browse files
committed
Merge pull request #95 from ticosax/test-dj1.8-drf3.1
Test against django1.8 and drf 3.1.0
2 parents 96eb5d9 + e3a813e commit 97254ba

File tree

5 files changed

+63
-10
lines changed

5 files changed

+63
-10
lines changed

.travis.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,51 @@ env:
88
- TOX_ENV=py27-django1.6-drf2.4.3
99
- TOX_ENV=py27-django1.6-drf2.4.4
1010
- TOX_ENV=py27-django1.6-drf3.0.0
11+
- TOX_ENV=py27-django1.6-drf3.1.0
1112
- TOX_ENV=py27-django1.7-drf2.4.3
1213
- TOX_ENV=py27-django1.7-drf2.4.4
1314
- TOX_ENV=py27-django1.7-drf3.0.0
15+
- TOX_ENV=py27-django1.7-drf3.1.0
16+
- TOX_ENV=py27-django1.8-drf2.4.3
17+
- TOX_ENV=py27-django1.8-drf2.4.4
18+
- TOX_ENV=py27-django1.8-drf3.0.0
19+
- TOX_ENV=py27-django1.8-drf3.1.0
1420
- TOX_ENV=py32-django1.6-drf2.4.3
1521
- TOX_ENV=py32-django1.6-drf2.4.4
1622
- TOX_ENV=py32-django1.6-drf3.0.0
23+
- TOX_ENV=py32-django1.6-drf3.1.0
1724
- TOX_ENV=py32-django1.7-drf2.4.3
1825
- TOX_ENV=py32-django1.7-drf2.4.4
1926
- TOX_ENV=py32-django1.7-drf3.0.0
27+
- TOX_ENV=py32-django1.7-drf3.1.0
28+
- TOX_ENV=py32-django1.8-drf2.4.3
29+
- TOX_ENV=py32-django1.8-drf2.4.4
30+
- TOX_ENV=py32-django1.8-drf3.0.0
31+
- TOX_ENV=py32-django1.8-drf3.1.0
2032
- TOX_ENV=py33-django1.6-drf2.4.3
2133
- TOX_ENV=py33-django1.6-drf2.4.4
2234
- TOX_ENV=py33-django1.6-drf3.0.0
35+
- TOX_ENV=py33-django1.6-drf3.1.0
2336
- TOX_ENV=py33-django1.7-drf2.4.3
2437
- TOX_ENV=py33-django1.7-drf2.4.4
2538
- TOX_ENV=py33-django1.7-drf3.0.0
39+
- TOX_ENV=py33-django1.7-drf3.1.0
40+
- TOX_ENV=py33-django1.8-drf2.4.3
41+
- TOX_ENV=py33-django1.8-drf2.4.4
42+
- TOX_ENV=py33-django1.8-drf3.0.0
43+
- TOX_ENV=py33-django1.8-drf3.1.0
2644
- TOX_ENV=py34-django1.6-drf2.4.3
2745
- TOX_ENV=py34-django1.6-drf2.4.4
2846
- TOX_ENV=py34-django1.6-drf3.0.0
47+
- TOX_ENV=py34-django1.6-drf3.1.0
2948
- TOX_ENV=py34-django1.7-drf2.4.3
3049
- TOX_ENV=py34-django1.7-drf2.4.4
3150
- TOX_ENV=py34-django1.7-drf3.0.0
51+
- TOX_ENV=py34-django1.7-drf3.1.0
52+
- TOX_ENV=py34-django1.8-drf2.4.3
53+
- TOX_ENV=py34-django1.8-drf2.4.4
54+
- TOX_ENV=py34-django1.8-drf3.0.0
55+
- TOX_ENV=py34-django1.8-drf3.1.0
3256

3357
matrix:
3458
fast_finish: true

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Requirements
2323
------------
2424

2525
- Python (2.7, 3.2, 3.3, 3.4)
26-
- Django (1.6, 1.7)
27-
- Django REST Framework (2.4.3, 2.4.4, 3.0.0)
26+
- Django (1.6, 1.7, 1.8)
27+
- Django REST Framework (2.4.3, 2.4.4, 3.0.0, 3.1.0)
2828

2929
Installation
3030
------------

tests/conftest.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
def pytest_configure():
2+
import django
23
from django.conf import settings
34

45
settings.configure(
@@ -52,6 +53,9 @@ def pytest_configure():
5253
)
5354

5455
try:
56+
if django.VERSION >= (1, 8):
57+
# django-oauth2-provider does not support Django1.8
58+
raise ImportError
5559
import provider # NOQA
5660
except ImportError:
5761
pass

tests/test_authentication.py

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,30 @@
55
from django.contrib.auth import get_user_model
66

77
from rest_framework import permissions, status
8-
from rest_framework.authentication import OAuth2Authentication
9-
from rest_framework.compat import oauth2_provider
8+
try:
9+
from rest_framework_oauth.authentication import OAuth2Authentication
10+
except ImportError:
11+
try:
12+
from rest_framework.authentication import OAuth2Authentication
13+
except ImportError:
14+
OAuth2Authentication = None
15+
try:
16+
try:
17+
from rest_framework_oauth.compat import oauth2_provider
18+
from rest_framework_oauth.compat.oauth2_provider import oauth2
19+
except ImportError:
20+
# if oauth2 module can not be imported, skip the tests,
21+
# because models have not been initialized.
22+
oauth2_provider = None
23+
except ImportError:
24+
try:
25+
from rest_framework.compat import oauth2_provider
26+
from rest_framework.compat.oauth2_provider import oauth2 # NOQA
27+
except ImportError:
28+
# if oauth2 module can not be imported, skip the tests,
29+
# because models have not been initialized.
30+
oauth2_provider = None
31+
1032
from rest_framework.test import APIRequestFactory, APIClient
1133
from rest_framework.views import APIView
1234

tox.ini

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
[tox]
22
envlist =
33
py27-{flake8,docs},
4-
{py27,py33,py34}-django{1.6,1.7}-drf{2.4.3,2.4.4,3.0.0}
4+
{py27,py33,py34}-django{1.6,1.7,1.8}-drf{2.4.3,2.4.4,3.0.0,3.1.0}
55

66
[testenv]
7-
commands = ./runtests.py --fast
7+
commands = ./runtests.py --fast {posargs}
88
setenv =
99
PYTHONDONTWRITEBYTECODE=1
1010
deps =
1111
django1.6: Django==1.6.8
1212
django1.7: Django==1.7.1
13+
django1.8: Django==1.8
1314
drf2.4.3: djangorestframework==2.4.3
1415
drf2.4.4: djangorestframework==2.4.4
1516
drf3.0.0: djangorestframework==3.0.0
16-
py27-django1.6-drf{2.4.3,2.4.4,3.0.0}: oauth2==1.5.211
17-
py27-django1.6-drf{2.4.3,2.4.4,3.0.0}: django-oauth-plus==2.2.1
18-
py27-django1.6-drf{2.4.3,2.4.4,3.0.0}: django-oauth2-provider==0.2.4
19-
pytest-django==2.6.1
17+
drf3.1.0: djangorestframework==3.1.0
18+
py27-django1.6-drf{2.4.3,2.4.4,3.0.0,3.1.0}: oauth2==1.5.211
19+
py27-django1.6-drf{2.4.3,2.4.4,3.0.0,3.1.0}: django-oauth-plus==2.2.6
20+
py27-django1.6-drf{2.4.3,2.4.4,3.0.0,3.1.0}: django-oauth2-provider==0.2.6.1
21+
pytest-django==2.8.0
22+
py27-django{1.6,1.7,1.8}-drf3.1.0: djangorestframework-oauth==1.0.1
2023

2124
[testenv:py27-flake8]
2225
commands = ./runtests.py --lintonly

0 commit comments

Comments
 (0)