Skip to content

Commit 790eab2

Browse files
author
Ryan P Kilby
authored
0.10.x release prep, update dependencies (#166)
* Add 0.10.0 changelog * Fix README formatting on pypi * Update dependencies * Simplify travis build matrix * Use detox for test parallelism
1 parent b5ccd8a commit 790eab2

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

.travis.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,10 @@ python:
99
- "3.5"
1010
- "3.6"
1111

12-
env:
13-
- DJANGO=1.10 REST_FRAMEWORK=3.5
14-
- DJANGO=1.9 REST_FRAMEWORK=3.5
15-
- DJANGO=1.8 REST_FRAMEWORK=3.5
16-
- DJANGO=1.8 REST_FRAMEWORK=3.4
17-
1812
install:
19-
- travis_retry pip install tox tox-travis coverage
13+
- travis_retry pip install detox tox-travis coverage
2014
script:
21-
- tox -- -v 2
15+
- detox -- -v 2
2216
after_success:
2317
- coverage report
2418
- bash <(curl -s https://codecov.io/bash)
@@ -29,11 +23,6 @@ matrix:
2923
env: TOXENV="performance"
3024
- python: "3.6"
3125
env: TOXENV="warnings"
32-
exclude:
33-
- python: "3.3"
34-
env: DJANGO=1.10 REST_FRAMEWORK=3.5
35-
- python: "3.3"
36-
env: DJANGO=1.9 REST_FRAMEWORK=3.5
3726
allow_failures:
3827
- env: TOXENV="warnings"
3928
fast_finish: true

CHANGELOG.rst

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
11
Unreleased:
22
-----------
33

4-
* Add support for django-filter 1.0
4+
v0.10.0:
5+
--------
6+
7+
This release primarily adds compatibility with django-filter 1.0 (more details
8+
in #144), and is an intermediate step to overhauling the behavior of filters
9+
that span relationships.
10+
11+
As `RelatedFilter` is a subclass of `ModelChoiceFilter`, you may take advantage
12+
of the `callable` behavior for the `queryset` argument. The `queryset` is now a
13+
required argument, which is a forwards-incompatible change. You can provide the
14+
model's default queryset to maintain the current behavior, or a callable, which
15+
will allow you to filter the queryset by the request's properties.
16+
17+
* #124 Removed deprecation warnings
18+
* #128 Fix all lookups handling for related fields
19+
* #129 Fix template rendering
20+
* #139 Fix metaclass inheritance bug
21+
* #146 Make `RelatedFilter.queryset` a required argument
22+
* #154 Add python 3.6 support
23+
* #161 Fix request-based filtering
524

625
v0.9.1:
726
-------

README.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ Features
4242
Requirements
4343
------------
4444

45-
* Python 2.7 or 3.3+
46-
* Django 1.8, 1.9, 1.10
47-
* Django REST framework 3.4, 3.5
45+
* **Python**: 2.7 or 3.3+
46+
* **Django**: 1.8, 1.9, 1.10, 1.11
47+
* **DRF**: 3.5, 3.6
4848

4949

5050
Installation
@@ -135,7 +135,7 @@ You can easily traverse multiple relationships when filtering by using ``Related
135135
136136
Example filter calls:
137137
138-
.. code-block:: http
138+
.. code-block::
139139
140140
/api/companies?department__name=Accounting
141141
/api/companies?department__manager__name__startswith=Bob
@@ -212,7 +212,7 @@ to all filter classes. It incorporates some of the implementation details of the
212212
213213
The above would enable the following filter calls:
214214
215-
.. code-block:: http
215+
.. code-block::
216216
217217
/api/posts?is_published=true
218218
/api/authors?posts__is_published=true
@@ -229,23 +229,23 @@ Automatic Filter Negation/Exclusion
229229
FilterSets support automatic exclusion using a simple ``param!=value`` syntax. This syntax
230230
internally sets the ``exclude`` property on the filter.
231231
232-
.. code-block:: http
232+
.. code-block::
233233
234234
/api/page?title!=The%20Park
235235
236236
This syntax supports regular filtering combined with exclusion filtering. For example, the
237237
following would search for all articles containing "Hello" in the title, while excluding
238238
those containing "World".
239239
240-
.. code-block:: http
240+
.. code-block::
241241
242242
/api/articles?title__contains=Hello&title__contains!=World
243243
244244
Note that most filters only accept a single query parameter. In the above, ``title__contains``
245245
and ``title__contains!`` are interpreted as two separate query parameters. The following would
246246
probably be invalid, although it depends on the specifics of the individual filter class:
247247
248-
.. code-block:: http
248+
.. code-block::
249249
250250
/api/articles?title__contains=Hello&title__contains!=World&title_contains!=Friend
251251

tox.ini

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
[tox]
22
envlist =
33
; Test two versions of DRF against Django's LTS
4-
py{27,33,34,35,36}-django18-restframework{34,35},
5-
py{27,34,35,36}-django{19,110}-restframework{35},
4+
py{27,33,34,35,36}-django18-restframework{35,36},
5+
py{27,34,35,36}-django{19,110}-restframework{36},
6+
py{27,35,36}-django{111}-restframework{36},
67
performance, warnings,
78

89
[travis]
910
unignore_outcomes = true
1011

11-
[travis:env]
12-
DJANGO =
13-
1.8: django18
14-
1.9: django19
15-
1.10: django110
16-
17-
REST_FRAMEWORK =
18-
3.4: restframework34
19-
3.5: restframework35
20-
2112
[testenv]
2213
commands = coverage run manage.py test {posargs}
2314
setenv =
@@ -27,8 +18,9 @@ deps =
2718
django18: django>=1.8.0,<1.9.0
2819
django19: django>=1.9.0,<1.10.0
2920
django110: django>=1.10.0,<1.11.0
30-
restframework34: djangorestframework>=3.4,<3.5
21+
django111: django>=1.11.0,<1.12.0
3122
restframework35: djangorestframework>=3.5,<3.6
23+
restframework36: djangorestframework>=3.6,<3.7
3224

3325
[testenv:performance]
3426
commands = python manage.py test tests.perf {posargs}

0 commit comments

Comments
 (0)