Skip to content
Open
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
4 changes: 2 additions & 2 deletions dynamic_rest/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from functools import reduce
from rest_framework import serializers
from rest_framework.exceptions import ValidationError
from rest_framework.fields import BooleanField, NullBooleanField
from rest_framework.fields import BooleanField
from rest_framework.filters import BaseFilterBackend, OrderingFilter

from dynamic_rest.utils import is_truthy
Expand Down Expand Up @@ -148,7 +148,7 @@ def rewrite_filters(fs, serializer):
out = {}
for node in fs.values():
filter_key, field = node.generate_query_key(serializer)
if isinstance(field, (BooleanField, NullBooleanField)):
if isinstance(field, BooleanField):
node.value = is_truthy(node.value)
out[filter_key] = node.value

Expand Down
4 changes: 2 additions & 2 deletions install_requires.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Django>=2.2,<4.2
djangorestframework>=3.11.2,<3.15
Django>=2.2,<4.3
djangorestframework>=3.14.0,<3.15
inflection>=0.4.0
requests
hashids>=1.3.1
Expand Down
6 changes: 3 additions & 3 deletions requirements.benchmark.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dj-database-url==0.3.0
django-debug-toolbar==1.7
Django>=2.2,<4.2
djangorestframework>=3.11.2,<3.15
django-debug-toolbar==1.11.1
Django>=2.2,<4.3
djangorestframework>=3.14.0,<3.15
djay>=0.0.9
flake8>=3.0
psycopg2-binary==2.9.3
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ addopts=--tb=short
[tox]
envlist =
py310-lint,
{py37,py38,py39,py310}-django{22,31,32,40,41}-drf{311,312,313,314},
{py37,py38,py39,py310}-django{22,31,32,40,41,42}-drf{311,312,313,314},

[testenv]
commands = ./runtests.py --fast {posargs} --coverage -rw
Expand All @@ -16,6 +16,7 @@ deps =
django32: Django>=3.2,<3.3
django40: Django>=4.0,<4.1
django41: Django>=4.1,<4.2
django42: Django>=4.2,<4.3
drf311: djangorestframework>=3.11.2,<3.12
drf312: djangorestframework>=3.12,<3.13
drf313: djangorestframework>=3.13,<3.14
Expand All @@ -29,6 +30,6 @@ deps = -rrequirements.txt
[testenv:py310-drf314-benchmarks]
commands = ./runtests.py --benchmarks
deps =
Django==4.1.1
Django>=4.2,<4.3
djangorestframework==3.14
-rrequirements.benchmark.txt