diff --git a/.travis.yml b/.travis.yml index 7970b1f..1406bf0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,8 +51,20 @@ matrix: env: REQ="Django>=3.1,<3.2" - python: "3.8" env: REQ="Django>=3.2,<3.3" + - python: "3.8" + env: REQ="Django>=4.0,<4.1" + - python: "3.8" + env: REQ="Django>=4.1,<4.2" - python: "3.9" env: REQ="Django>=3.2,<3.3" + - python: "3.9" + env: REQ="Django>=4.0,<4.1" + - python: "3.9" + env: REQ="Django>=4.1,<4.2" + - python: "3.10" + env: REQ="Django>=4.1,<4.2" + - python: "3.11" + env: REQ="Django>=4.1,<4.2" before_install: - sudo apt-get -y install firefox-geckodriver install: diff --git a/README.rst b/README.rst index c549a55..39909c4 100644 --- a/README.rst +++ b/README.rst @@ -4,17 +4,17 @@ Welcome to django-more-admin-filters .. image:: https://travis-ci.com/thomst/django-more-admin-filters.svg?branch=master :target: https://travis-ci.com/thomst/django-more-admin-filters - + .. image:: https://coveralls.io/repos/github/thomst/django-more-admin-filters/badge.svg?branch=master :target: https://coveralls.io/github/thomst/django-more-admin-filters?branch=master .. image:: https://img.shields.io/badge/python-3.5%20%7C%203.6%20%7C%203.7%20%7C%203.8%20%7C%203.9-blue :target: https://img.shields.io/badge/python-3.5%20%7C%203.6%20%7C%203.7%20%7C%203.8%20%7C%203.9-blue - :alt: python: 3.5, 3.6, 3.7, 3.8, 3.9 + :alt: python: 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11 .. image:: https://img.shields.io/badge/django-1.11%20%7C%202.0%20%7C%202.1%20%7C%202.2%20%7C%203.0%20%7C%203.1%20%7C%203.2-orange :target: https://img.shields.io/badge/django-1.11%20%7C%202.0%20%7C%202.1%20%7C%202.2%20%7C%203.0%20%7C%203.1%20%7C%203.2-orange - :alt: django: 1.11, 2.0, 2.1, 2.2, 3.0, 3.1, 3.2 + :alt: django: 1.11, 2.0, 2.1, 2.2, 3.0, 3.1, 3.2, 4.0, 4.1 Description diff --git a/more_admin_filters/filters.py b/more_admin_filters/filters.py index 8a41b54..145c473 100644 --- a/more_admin_filters/filters.py +++ b/more_admin_filters/filters.py @@ -2,7 +2,6 @@ from django.contrib.admin.utils import prepare_lookup_value from django.contrib import admin from django.db.models import Q -from django.utils.encoding import force_text from django.utils.translation import gettext_lazy as _ from django.contrib.admin.utils import reverse_field_path from django.contrib.admin.utils import get_model_from_relation diff --git a/setup.py b/setup.py index 1cc2bef..53ea8c8 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ setup( packages=find_packages(exclude=["tests"]), include_package_data=True, install_requires=[ - "Django>=1.11,<3.3", + "Django>=1.11,<=4.1", ], classifiers=[ dev_status, @@ -48,6 +48,9 @@ setup( "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Topic :: Internet :: WWW/HTTP :: Dynamic Content", "Topic :: Software Development", "Topic :: Software Development :: Libraries :: Application Frameworks", diff --git a/tests/testapp/urls.py b/tests/testapp/urls.py index c242ced..5b692c8 100644 --- a/tests/testapp/urls.py +++ b/tests/testapp/urls.py @@ -14,8 +14,8 @@ Including another URLconf 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.conf.urls import url +from django.urls import re_path urlpatterns = [ - url(r'^admin/', admin.site.urls), + re_path(r'^admin/', admin.site.urls), ] diff --git a/tox.ini b/tox.ini index 4e8584c..d54deab 100644 --- a/tox.ini +++ b/tox.ini @@ -12,6 +12,8 @@ envlist = {py36,py37,py38}-django30, {py36,py37,py38}-django31, {py36,py37,py38,py39}-django32 + {py38,py39}-django40 + {py38,py39,py310,py311}-django41 skip_missing_interpreters = true [testenv] @@ -23,6 +25,8 @@ deps = django30: Django>=3.0,<3.1 django31: Django>=3.1,<3.2 django32: Django>=3.2,<3.3 + django40: Django>=4.0,<4.1 + django41: Django>=4.1,<4.2 selenium commands = {envpython} tests/manage.py test testapp {posargs}