Skip to content

django-filter>=2.1 #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 11, 2019
Merged

django-filter>=2.1 #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
917672a
django-filter>=2.1
n2ygk Jun 7, 2019
4acecf9
Merge branch 'master' into df21
sliverc Jun 9, 2019
e9f3d62
Merge branch 'master' into df21
sliverc Jun 11, 2019
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
90 changes: 45 additions & 45 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ cache: pip
# Favor explicit over implicit and use an explicit build matrix.
matrix:
allow_failures:
- env: TOXENV=py34-df20-django20-drfmaster
- env: TOXENV=py35-df20-django20-drfmaster
- env: TOXENV=py36-df20-django20-drfmaster
- env: TOXENV=py37-df20-django20-drfmaster
- env: TOXENV=py35-df20-django21-drfmaster
- env: TOXENV=py36-df20-django21-drfmaster
- env: TOXENV=py37-df20-django21-drfmaster
- env: TOXENV=py35-df20-django22-drfmaster
- env: TOXENV=py36-df20-django22-drfmaster
- env: TOXENV=py37-df20-django22-drfmaster
- env: TOXENV=py34-df21-django20-drfmaster
- env: TOXENV=py35-df21-django20-drfmaster
- env: TOXENV=py36-df21-django20-drfmaster
- env: TOXENV=py37-df21-django20-drfmaster
- env: TOXENV=py35-df21-django21-drfmaster
- env: TOXENV=py36-df21-django21-drfmaster
- env: TOXENV=py37-df21-django21-drfmaster
- env: TOXENV=py35-df21-django22-drfmaster
- env: TOXENV=py36-df21-django22-drfmaster
- env: TOXENV=py37-df21-django22-drfmaster

include:
- python: 3.6
Expand All @@ -29,94 +29,94 @@ matrix:
env: TOXENV=py27-df11-django111-drf39

- python: 3.4
env: TOXENV=py34-df20-django111-drf36
env: TOXENV=py34-df21-django111-drf36
- python: 3.4
env: TOXENV=py34-df20-django111-drf37
env: TOXENV=py34-df21-django111-drf37
- python: 3.4
env: TOXENV=py34-df20-django111-drf38
env: TOXENV=py34-df21-django111-drf38
- python: 3.4
env: TOXENV=py34-df20-django20-drf37
env: TOXENV=py34-df21-django20-drf37
- python: 3.4
env: TOXENV=py34-df20-django20-drf38
env: TOXENV=py34-df21-django20-drf38
- python: 3.4
env: TOXENV=py34-df20-django20-drf39
env: TOXENV=py34-df21-django20-drf39
- python: 3.4
env: TOXENV=py34-df20-django20-drfmaster
env: TOXENV=py34-df21-django20-drfmaster

- python: 3.5
env: TOXENV=py35-df20-django111-drf36
env: TOXENV=py35-df21-django111-drf36
- python: 3.5
env: TOXENV=py35-df20-django111-drf37
env: TOXENV=py35-df21-django111-drf37
- python: 3.5
env: TOXENV=py35-df20-django111-drf38
env: TOXENV=py35-df21-django111-drf38
- python: 3.5
env: TOXENV=py35-df20-django20-drf37
env: TOXENV=py35-df21-django20-drf37
- python: 3.5
env: TOXENV=py35-df20-django20-drf38
env: TOXENV=py35-df21-django20-drf38
- python: 3.5
env: TOXENV=py35-df20-django20-drf39
env: TOXENV=py35-df21-django20-drf39
- python: 3.5
env: TOXENV=py35-df20-django20-drfmaster
env: TOXENV=py35-df21-django20-drfmaster
- python: 3.5
env: TOXENV=py35-df20-django21-drf39
env: TOXENV=py35-df21-django21-drf39
- python: 3.5
env: TOXENV=py35-df20-django21-drfmaster
env: TOXENV=py35-df21-django21-drfmaster
- python: 3.5
dist: xenial
env: TOXENV=py35-df20-django22-drf39
env: TOXENV=py35-df21-django22-drf39
- python: 3.5
dist: xenial
env: TOXENV=py35-df20-django22-drfmaster
env: TOXENV=py35-df21-django22-drfmaster

- python: 3.6
env: TOXENV=py36-df20-django111-drf36
env: TOXENV=py36-df21-django111-drf36
- python: 3.6
env: TOXENV=py36-df20-django111-drf37
env: TOXENV=py36-df21-django111-drf37
- python: 3.6
env: TOXENV=py36-df20-django111-drf38
env: TOXENV=py36-df21-django111-drf38
- python: 3.6
env: TOXENV=py36-df20-django20-drf37
env: TOXENV=py36-df21-django20-drf37
- python: 3.6
env: TOXENV=py36-df20-django20-drf38
env: TOXENV=py36-df21-django20-drf38
- python: 3.6
env: TOXENV=py36-df20-django20-drf39
env: TOXENV=py36-df21-django20-drf39
- python: 3.6
env: TOXENV=py36-df20-django20-drfmaster
env: TOXENV=py36-df21-django20-drfmaster
- python: 3.6
env: TOXENV=py36-df20-django21-drf39
env: TOXENV=py36-df21-django21-drf39
- python: 3.6
env: TOXENV=py36-df20-django21-drfmaster
env: TOXENV=py36-df21-django21-drfmaster
- python: 3.6
dist: xenial
env: TOXENV=py36-df20-django22-drf39
env: TOXENV=py36-df21-django22-drf39
- python: 3.6
dist: xenial
env: TOXENV=py36-df20-django22-drfmaster
env: TOXENV=py36-df21-django22-drfmaster

- python: 3.7
dist: xenial
sudo: required
env: TOXENV=py37-df20-django20-drf39
env: TOXENV=py37-df21-django20-drf39
- python: 3.7
dist: xenial
sudo: required
env: TOXENV=py37-df20-django20-drfmaster
env: TOXENV=py37-df21-django20-drfmaster
- python: 3.7
dist: xenial
sudo: required
env: TOXENV=py37-df20-django21-drf39
env: TOXENV=py37-df21-django21-drf39
- python: 3.7
dist: xenial
sudo: required
env: TOXENV=py37-df20-django21-drfmaster
env: TOXENV=py37-df21-django21-drfmaster
- python: 3.7
dist: xenial
sudo: required
env: TOXENV=py37-df20-django22-drf39
env: TOXENV=py37-df21-django22-drf39
- python: 3.7
dist: xenial
sudo: required
env: TOXENV=py37-df20-django22-drfmaster
env: TOXENV=py37-df21-django22-drfmaster
install:
- pip install tox
script:
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[tox]
envlist =
py27-df11-django111-drf{36,37,38,39}
py{34,35,36}-df20-django111-drf{36,37,38,39,master},
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},
py{34,35,36}-df21-django111-drf{36,37,38,39,master},
py{34,35,36}-df21-django20-drf{37,38,39,master},
py37-df21-django20-drf{39,master},
py{35,36,37}-df21-django21-drf{39,master},
py{35,36,37}-df21-django22-drf{39,master},

[testenv]
deps =
Expand All @@ -19,7 +19,7 @@ deps =
drf39: djangorestframework>=3.9.0,<3.10
drfmaster: https://github.com/encode/django-rest-framework/archive/master.zip
df11: django-filter<=1.1
df20: django-filter>=2.0
df21: django-filter>=2.1

setenv =
PYTHONPATH = {toxinidir}
Expand Down