Skip to content

Commit

Permalink
Drop Django 2.1 and below (#1180)
Browse files Browse the repository at this point in the history
* Drop Django 2.1 and below

* Update DRF test dependency

* Drop Django 1.11 compat code
  • Loading branch information
rpkilby committed Mar 12, 2020
1 parent cecd126 commit 4c78f08
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
4 changes: 0 additions & 4 deletions django_filters/utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import warnings
from collections import OrderedDict

import django
from django.conf import settings
from django.core.exceptions import FieldDoesNotExist, FieldError
from django.db import models
Expand Down Expand Up @@ -196,9 +195,6 @@ def resolve_field(model_field, lookup_expr):
while lookups:
name = lookups[0]
args = (lhs, name)
if django.VERSION < (2, 0):
# rest_of_lookups was removed in Django 2.0
args += (lookups,)
# If there is just one part left, try first get_lookup() so
# that if the lhs supports both transform and lookup for the
# name, then lookup will be picked.
Expand Down
10 changes: 2 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
[tox]
envlist =
{py35,py36}-django111,
{py35,py36}-django20,
{py35,py36,py37}-django21,
{py35,py36,py37}-django22,
{py36,py37,py38}-django30,
{py36,py37,py38}-latest,
Expand All @@ -21,12 +18,9 @@ ignore_outcome =
setenv =
PYTHONDONTWRITEBYTECODE=1
deps =
django111: django==1.11.*
django20: django==2.0.*
django21: django==2.1.*
django22: django==2.2.*
django30: django>=3.0,<3.1
djangorestframework==3.10.*
django30: django>=3.0.*
djangorestframework==3.11.*
latest: {[latest]deps}
-rrequirements/test-ci.txt

Expand Down

0 comments on commit 4c78f08

Please sign in to comment.