Skip to content

Commit 1b51eb8

Browse files
authored
Merge pull request #380 from Tivix/travis-conf-fixes
Travis conf fixes
2 parents e4c0452 + 2c1649d commit 1b51eb8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ python:
33
- "2.7"
44
- "3.5"
55
env:
6-
- DJANGO=1.8.18
7-
- DJANGO=1.10.7
8-
- DJANGO=1.11.1
6+
- DJANGO=1.8.* DRF=3.6.*
7+
- DJANGO=1.10.* DRF=3.7.*
8+
- DJANGO=1.11.* DRF=3.7.*
99
install:
10-
- pip install -q Django==$DJANGO
10+
- pip install -q Django==$DJANGO djangorestframework==$DRF
1111
- pip install coveralls
1212
- pip install -r rest_auth/tests/requirements.pip
1313
script:

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
zip_safe=False,
3030
install_requires=[
3131
'Django>=1.8.0',
32-
'djangorestframework>=3.1.0',
32+
'djangorestframework>=3.1.3',
3333
'six>=1.9.0',
3434
],
3535
extras_require={

0 commit comments

Comments
 (0)