Skip to content

Commit

Permalink
Merge de449ec into e62f1f9
Browse files Browse the repository at this point in the history
  • Loading branch information
tmessi committed May 24, 2018
2 parents e62f1f9 + de449ec commit dbb7aa0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 17 deletions.
22 changes: 7 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,20 @@
language: python
python:
- "2.7"
- "3.2"
- "3.3"
- "3.4"
- "3.5"
- "3.6"
env:
- DJANGO_VERSION=1.8.14
- DJANGO_VERSION=1.9.9
- DJANGO_VERSION=1.10.1
- DJANGO='Django<2,>=1.11' DRF='djangorestframework<3.5,>=3.4'
- DJANGO='Django<2,>=1.11' DRF='djangorestframework<3.6,>=3.5'
- DJANGO='Django<2,>=1.11' DRF='djangorestframework<3.7,>=3.6'
- DJANGO='Django<2,>=1.11' DRF='djangorestframework<3.8,>=3.7'
- DJANGO='Django<2,>=1.11' DRF='djangorestframework<3.9,>=3.8'
matrix:
exclude:
- python: "3.2"
env: DJANGO_VERSION=1.9.9
- python: "3.2"
env: DJANGO_VERSION=1.10.1
- python: "3.3"
env: DJANGO_VERSION=1.9.9
- python: "3.3"
env: DJANGO_VERSION=1.10.1
fast_finish: true

install:
- pip install Django==$DJANGO_VERSION djangorestframework==3.4.6
- pip install "$DJANGO" "$DRF"
- 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.4'
],
test_suite='runtests.run',
tests_require=[
'Django>=1.8.14,<=1.10.1'
'Django>=1.11,<2'
],
zip_safe=False,
classifiers=[
Expand Down

0 comments on commit dbb7aa0

Please sign in to comment.