Skip to content

Commit 1a09191

Browse files
n2ygksliverc
authored andcommittedJun 11, 2019
Adjust test to use django-filter>=2.1 (#656)
1 parent e1be895 commit 1a09191

File tree

2 files changed

+51
-51
lines changed

2 files changed

+51
-51
lines changed
 

‎.travis.yml

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ cache: pip
44
# Favor explicit over implicit and use an explicit build matrix.
55
matrix:
66
allow_failures:
7-
- env: TOXENV=py34-df20-django20-drfmaster
8-
- env: TOXENV=py35-df20-django20-drfmaster
9-
- env: TOXENV=py36-df20-django20-drfmaster
10-
- env: TOXENV=py37-df20-django20-drfmaster
11-
- env: TOXENV=py35-df20-django21-drfmaster
12-
- env: TOXENV=py36-df20-django21-drfmaster
13-
- env: TOXENV=py37-df20-django21-drfmaster
14-
- env: TOXENV=py35-df20-django22-drfmaster
15-
- env: TOXENV=py36-df20-django22-drfmaster
16-
- env: TOXENV=py37-df20-django22-drfmaster
7+
- env: TOXENV=py34-df21-django20-drfmaster
8+
- env: TOXENV=py35-df21-django20-drfmaster
9+
- env: TOXENV=py36-df21-django20-drfmaster
10+
- env: TOXENV=py37-df21-django20-drfmaster
11+
- env: TOXENV=py35-df21-django21-drfmaster
12+
- env: TOXENV=py36-df21-django21-drfmaster
13+
- env: TOXENV=py37-df21-django21-drfmaster
14+
- env: TOXENV=py35-df21-django22-drfmaster
15+
- env: TOXENV=py36-df21-django22-drfmaster
16+
- env: TOXENV=py37-df21-django22-drfmaster
1717

1818
include:
1919
- python: 3.6
@@ -29,94 +29,94 @@ matrix:
2929
env: TOXENV=py27-df11-django111-drf39
3030

3131
- python: 3.4
32-
env: TOXENV=py34-df20-django111-drf36
32+
env: TOXENV=py34-df21-django111-drf36
3333
- python: 3.4
34-
env: TOXENV=py34-df20-django111-drf37
34+
env: TOXENV=py34-df21-django111-drf37
3535
- python: 3.4
36-
env: TOXENV=py34-df20-django111-drf38
36+
env: TOXENV=py34-df21-django111-drf38
3737
- python: 3.4
38-
env: TOXENV=py34-df20-django20-drf37
38+
env: TOXENV=py34-df21-django20-drf37
3939
- python: 3.4
40-
env: TOXENV=py34-df20-django20-drf38
40+
env: TOXENV=py34-df21-django20-drf38
4141
- python: 3.4
42-
env: TOXENV=py34-df20-django20-drf39
42+
env: TOXENV=py34-df21-django20-drf39
4343
- python: 3.4
44-
env: TOXENV=py34-df20-django20-drfmaster
44+
env: TOXENV=py34-df21-django20-drfmaster
4545

4646
- python: 3.5
47-
env: TOXENV=py35-df20-django111-drf36
47+
env: TOXENV=py35-df21-django111-drf36
4848
- python: 3.5
49-
env: TOXENV=py35-df20-django111-drf37
49+
env: TOXENV=py35-df21-django111-drf37
5050
- python: 3.5
51-
env: TOXENV=py35-df20-django111-drf38
51+
env: TOXENV=py35-df21-django111-drf38
5252
- python: 3.5
53-
env: TOXENV=py35-df20-django20-drf37
53+
env: TOXENV=py35-df21-django20-drf37
5454
- python: 3.5
55-
env: TOXENV=py35-df20-django20-drf38
55+
env: TOXENV=py35-df21-django20-drf38
5656
- python: 3.5
57-
env: TOXENV=py35-df20-django20-drf39
57+
env: TOXENV=py35-df21-django20-drf39
5858
- python: 3.5
59-
env: TOXENV=py35-df20-django20-drfmaster
59+
env: TOXENV=py35-df21-django20-drfmaster
6060
- python: 3.5
61-
env: TOXENV=py35-df20-django21-drf39
61+
env: TOXENV=py35-df21-django21-drf39
6262
- python: 3.5
63-
env: TOXENV=py35-df20-django21-drfmaster
63+
env: TOXENV=py35-df21-django21-drfmaster
6464
- python: 3.5
6565
dist: xenial
66-
env: TOXENV=py35-df20-django22-drf39
66+
env: TOXENV=py35-df21-django22-drf39
6767
- python: 3.5
6868
dist: xenial
69-
env: TOXENV=py35-df20-django22-drfmaster
69+
env: TOXENV=py35-df21-django22-drfmaster
7070

7171
- python: 3.6
72-
env: TOXENV=py36-df20-django111-drf36
72+
env: TOXENV=py36-df21-django111-drf36
7373
- python: 3.6
74-
env: TOXENV=py36-df20-django111-drf37
74+
env: TOXENV=py36-df21-django111-drf37
7575
- python: 3.6
76-
env: TOXENV=py36-df20-django111-drf38
76+
env: TOXENV=py36-df21-django111-drf38
7777
- python: 3.6
78-
env: TOXENV=py36-df20-django20-drf37
78+
env: TOXENV=py36-df21-django20-drf37
7979
- python: 3.6
80-
env: TOXENV=py36-df20-django20-drf38
80+
env: TOXENV=py36-df21-django20-drf38
8181
- python: 3.6
82-
env: TOXENV=py36-df20-django20-drf39
82+
env: TOXENV=py36-df21-django20-drf39
8383
- python: 3.6
84-
env: TOXENV=py36-df20-django20-drfmaster
84+
env: TOXENV=py36-df21-django20-drfmaster
8585
- python: 3.6
86-
env: TOXENV=py36-df20-django21-drf39
86+
env: TOXENV=py36-df21-django21-drf39
8787
- python: 3.6
88-
env: TOXENV=py36-df20-django21-drfmaster
88+
env: TOXENV=py36-df21-django21-drfmaster
8989
- python: 3.6
9090
dist: xenial
91-
env: TOXENV=py36-df20-django22-drf39
91+
env: TOXENV=py36-df21-django22-drf39
9292
- python: 3.6
9393
dist: xenial
94-
env: TOXENV=py36-df20-django22-drfmaster
94+
env: TOXENV=py36-df21-django22-drfmaster
9595

9696
- python: 3.7
9797
dist: xenial
9898
sudo: required
99-
env: TOXENV=py37-df20-django20-drf39
99+
env: TOXENV=py37-df21-django20-drf39
100100
- python: 3.7
101101
dist: xenial
102102
sudo: required
103-
env: TOXENV=py37-df20-django20-drfmaster
103+
env: TOXENV=py37-df21-django20-drfmaster
104104
- python: 3.7
105105
dist: xenial
106106
sudo: required
107-
env: TOXENV=py37-df20-django21-drf39
107+
env: TOXENV=py37-df21-django21-drf39
108108
- python: 3.7
109109
dist: xenial
110110
sudo: required
111-
env: TOXENV=py37-df20-django21-drfmaster
111+
env: TOXENV=py37-df21-django21-drfmaster
112112
- python: 3.7
113113
dist: xenial
114114
sudo: required
115-
env: TOXENV=py37-df20-django22-drf39
115+
env: TOXENV=py37-df21-django22-drf39
116116
- python: 3.7
117117
dist: xenial
118118
sudo: required
119-
env: TOXENV=py37-df20-django22-drfmaster
119+
env: TOXENV=py37-df21-django22-drfmaster
120120
install:
121121
- pip install tox
122122
script:

‎tox.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[tox]
22
envlist =
33
py27-df11-django111-drf{36,37,38,39}
4-
py{34,35,36}-df20-django111-drf{36,37,38,39,master},
5-
py{34,35,36}-df20-django20-drf{37,38,39,master},
6-
py37-df20-django20-drf{39,master},
7-
py{35,36,37}-df20-django21-drf{39,master},
8-
py{35,36,37}-df20-django22-drf{39,master},
4+
py{34,35,36}-df21-django111-drf{36,37,38,39,master},
5+
py{34,35,36}-df21-django20-drf{37,38,39,master},
6+
py37-df21-django20-drf{39,master},
7+
py{35,36,37}-df21-django21-drf{39,master},
8+
py{35,36,37}-df21-django22-drf{39,master},
99

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

2424
setenv =
2525
PYTHONPATH = {toxinidir}

0 commit comments

Comments
 (0)
Please sign in to comment.