diff --git a/more_admin_filters/__init__.py b/more_admin_filters/__init__.py index d1599d8..00c2a1e 100644 --- a/more_admin_filters/__init__.py +++ b/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, ) diff --git a/more_admin_filters/__version__.py b/more_admin_filters/__version__.py new file mode 100644 index 0000000..43959e9 --- /dev/null +++ b/more_admin_filters/__version__.py @@ -0,0 +1,16 @@ +""" +This project uses the Semantic Versioning scheme in conjunction with 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" 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 5c97621..49222c3 100644 --- a/setup.py +++ b/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( 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), ]