Merge branch 'DialerAI-support-django-4-1'

more_admin_filters/__init__.py

@@ -1,9 +1,11 @@
-VERSION = (1, 3)
-__version__ = ".".join(map(str, VERSION))
-
-
 from .filters import (
-    MultiSelectFilter, MultiSelectRelatedFilter, MultiSelectRelatedOnlyFilter,
-    MultiSelectDropdownFilter, MultiSelectRelatedDropdownFilter, DropdownFilter,
-    ChoicesDropdownFilter, RelatedDropdownFilter, BooleanAnnotationFilter
+    MultiSelectFilter,
+    MultiSelectRelatedFilter,
+    MultiSelectRelatedOnlyFilter,
+    MultiSelectDropdownFilter,
+    MultiSelectRelatedDropdownFilter,
+    DropdownFilter,
+    ChoicesDropdownFilter,
+    RelatedDropdownFilter,
+    BooleanAnnotationFilter,
 )

more_admin_filters/__version__.py

@@ -0,0 +1,16 @@
+"""
+This project uses the Semantic Versioning scheme in conjunction with PEP 0440:
+    <http://semver.org/>
+    <https://www.python.org/dev/peps/pep-0440>
+
+Major versions introduce significant changes to the API, and backwards
+compatibility is not guaranteed. Minor versions are for new features and other
+backwards-compatible changes to the API. Patch versions are for bug fixes and
+internal code changes that do not affect the API. Development versions are
+incomplete states of a release .
+
+Version 0.x should be considered a development version with an unstable API,
+and backwards compatibility is not guaranteed for minor versions.
+"""
+
+__version__ = "1.3"

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

setup.py

@@ -3,6 +3,15 @@
 import os
 from setuptools import setup
 from setuptools import find_packages
+from pathlib import Path
+
+
+def version():
+    """Get the local package version."""
+    namespace = {}
+    path = Path("more_admin_filters", "__version__.py")
+    exec(path.read_text(), namespace)
+    return namespace["__version__"]
 
 
 def read(filename):
@@ -11,13 +20,13 @@ def read(filename):
         return file.read()
 
 
-version = __import__("more_admin_filters").__version__
-if 'dev' in version:
-    dev_status = 'Development Status :: 3 - Alpha'
-elif 'beta' in version:
-    dev_status = 'Development Status :: 4 - Beta'
+version = version()
+if "dev" in version:
+    dev_status = "Development Status :: 3 - Alpha"
+elif "beta" in version:
+    dev_status = "Development Status :: 4 - Beta"
 else:
-    dev_status = 'Development Status :: 5 - Production/Stable'
+    dev_status = "Development Status :: 5 - Production/Stable"
 
 
 setup(

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),
 ]