From ad3b0af66ae7498c9df7d2c5125763b5ec862421 Mon Sep 17 00:00:00 2001 From: areski Date: Wed, 14 Dec 2022 12:28:57 +0100 Subject: [PATCH] [fix] move version from __init__ to avoid install conflict when django is not yet installed --- more_admin_filters/__init__.py | 16 +++++++++------- more_admin_filters/__version__.py | 16 ++++++++++++++++ setup.py | 22 +++++++++++++++------- 3 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 more_admin_filters/__version__.py 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/setup.py b/setup.py index 53ea8c8..8eb8098 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,18 +20,17 @@ 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' +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( name="django-more-admin-filters", - version=version, + version=version(), description="Additional filters for django-admin.", long_description=read("README.rst"), author="Thomas Leichtfuß",