Skip to content

Commit

Permalink
Merge 8952855 into e62f1f9
Browse files Browse the repository at this point in the history
  • Loading branch information
k0nG committed Oct 28, 2016
2 parents e62f1f9 + 8952855 commit d342c1e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ python:
env:
- DJANGO_VERSION=1.8.14
- DJANGO_VERSION=1.9.9
- DJANGO_VERSION=1.10.1
- DJANGO_VERSION=1.10.2
matrix:
exclude:
- python: "3.2"
env: DJANGO_VERSION=1.9.9
- python: "3.2"
env: DJANGO_VERSION=1.10.1
env: DJANGO_VERSION=1.10.2
- python: "3.3"
env: DJANGO_VERSION=1.9.9
- python: "3.3"
env: DJANGO_VERSION=1.10.1
env: DJANGO_VERSION=1.10.2
fast_finish: true

install:
- pip install Django==$DJANGO_VERSION djangorestframework==3.4.6
- pip install Django==$DJANGO_VERSION djangorestframework==3.5.1
- pip install coverage==3.7.1
- pip install coveralls
script:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
license='BSD',
packages=find_packages(exclude=['tests*']),
install_requires=[
'djangorestframework>=3.2.3,<=3.4.6'
'djangorestframework>=3.2.3,<=3.5.1'
],
test_suite='runtests.run',
tests_require=[
'Django>=1.8.14,<=1.10.1'
'Django>=1.8.14,<=1.10.2'
],
zip_safe=False,
classifiers=[
Expand Down

0 comments on commit d342c1e

Please sign in to comment.