From c858f8e9157dbb7915fac6d6920c31b12c061ab0 Mon Sep 17 00:00:00 2001 From: Chayim Date: Wed, 15 Dec 2021 17:00:39 +0200 Subject: Single sourcing the package version (#1791) --- redis/__init__.py | 12 +++++++++++- setup.py | 8 ++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/redis/__init__.py b/redis/__init__.py index 051b039..35044be 100644 --- a/redis/__init__.py +++ b/redis/__init__.py @@ -1,3 +1,10 @@ +import sys + +if sys.version_info >= (3, 8): + from importlib import metadata +else: + import importlib_metadata as metadata + from redis.client import Redis, StrictRedis from redis.cluster import RedisCluster from redis.connection import ( @@ -38,7 +45,10 @@ def int_or_str(value): return value -__version__ = "4.1.0rc2" +try: + __version__ = metadata.version("redis") +except metadata.PackageNotFoundError: + __version__ = "99.99.99" VERSION = tuple(map(int_or_str, __version__.split("."))) diff --git a/setup.py b/setup.py index b9c2e3e..524ea84 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,6 @@ #!/usr/bin/env python from setuptools import find_packages, setup -import redis - setup( name="redis", description="Python client for Redis database and key-value store", @@ -10,7 +8,7 @@ setup( long_description_content_type="text/markdown", keywords=["Redis", "key-value store", "database"], license="MIT", - version=redis.__version__, + version="4.1.0rc2", packages=find_packages( include=[ "redis", @@ -26,12 +24,10 @@ setup( author="Redis Inc.", author_email="oss@redis.com", python_requires=">=3.6", - setup_requires=[ - "packaging>=21.3", - ], install_requires=[ "deprecated>=1.2.3", "packaging>=21.3", + 'importlib-metadata >= 1.0; python_version < "3.8"', ], classifiers=[ "Development Status :: 5 - Production/Stable", -- cgit v1.2.1