Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ matrix:
- env: TOXENV=py36-df20-django21-drfmaster
- env: TOXENV=py37-df20-django21-drfmaster


include:
- python: 3.6
env: TOXENV=flake8
Expand Down Expand Up @@ -94,6 +95,10 @@ matrix:
dist: xenial
sudo: required
env: TOXENV=py37-df20-django21-drfmaster
- python: 3.7
dist: xenial
sudo: required
env: TOXENV=py37-df20-django22-drf39
install:
- pip install tox
script:
Expand Down
4 changes: 2 additions & 2 deletions requirements-development.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-e .
django-debug-toolbar==1.11
django-filter==2.1.0
django-polymorphic==2.0.3
django-filter>=2.1.0
django-polymorphic>=2.0.3
factory-boy==2.11.1
Faker==1.0.4
flake8==3.7.7
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from setuptools import setup

needs_mock = sys.version_info < (3, 3)
needs_mock = sys.version_info < (3, 5)
mock = ['mock'] if needs_mock else []
needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
pytest_runner = ['pytest-runner'] if needs_pytest else []
Expand Down Expand Up @@ -89,7 +89,7 @@ def get_package_data(package):
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Topic :: Internet :: WWW/HTTP',
Expand Down
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,20 @@ envlist =
py{34,35,36}-df20-django20-drf{37,38,39,master},
py37-df20-django20-drf{39,master},
py{35,36,37}-df20-django21-drf{39,master},
py{35,36,37}-df20-django22-drf{39,master},

[testenv]
deps =
django111: Django>=1.11,<1.12
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<3.0
drf36: djangorestframework>=3.6.3,<3.7
drf37: djangorestframework>=3.7.0,<3.8
drf38: djangorestframework>=3.8.0,<3.9
drf39: djangorestframework>=3.9.0,<3.10
drfmaster: https://github.com/encode/django-rest-framework/archive/master.zip
df11: django-filter<=1.1
df11: django-filter<=2.0
df20: django-filter>=2.0

setenv =
Expand Down