From be2ac99a342c2676f8ed249097531d01d27a885b Mon Sep 17 00:00:00 2001 From: mario Date: Tue, 31 Oct 2017 16:34:29 +0100 Subject: [PATCH 1/2] fix: changed travis.yml and setup.py configuration --- .travis.yml | 8 ++++---- setup.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce9529d..02ab3ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,11 @@ python: - "2.7" - "3.5" env: - - DJANGO=1.8.18 - - DJANGO=1.10.7 - - DJANGO=1.11.1 + - DJANGO=1.8.* DRF=3.6.* + - DJANGO=1.10.* DRF=3.7.* + - DJANGO=1.11.* DRF=3.7.* install: - - pip install -q Django==$DJANGO + - pip install -q Django==$DJANGO djangorestframework==$DRF - pip install coveralls - pip install -r rest_auth/tests/requirements.pip script: diff --git a/setup.py b/setup.py index d78a8b5..c3438cf 100644 --- a/setup.py +++ b/setup.py @@ -28,8 +28,8 @@ setup( keywords='django rest auth registration rest-framework django-registration api', zip_safe=False, install_requires=[ - 'Django>=1.8.0', - 'djangorestframework>=3.1.0', + 'Django==1.8.0', + 'djangorestframework==3.1.3', 'six>=1.9.0', ], extras_require={ From 2c1649daf166b0e9e656fad34048454e4d64a436 Mon Sep 17 00:00:00 2001 From: mario Date: Tue, 31 Oct 2017 17:13:57 +0100 Subject: [PATCH 2/2] fix: revert setup.py changes --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index c3438cf..b3aa55b 100644 --- a/setup.py +++ b/setup.py @@ -28,8 +28,8 @@ setup( keywords='django rest auth registration rest-framework django-registration api', zip_safe=False, install_requires=[ - 'Django==1.8.0', - 'djangorestframework==3.1.3', + 'Django>=1.8.0', + 'djangorestframework>=3.1.3', 'six>=1.9.0', ], extras_require={