From a0fb98c535e75d225ed418688d0bfa3b624ab904 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Wed, 15 Dec 2021 10:56:54 +0200 Subject: [PATCH 1/2] pulling version from setup.py --- redis/__init__.py | 8 +++++++- setup.py | 6 ++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/redis/__init__.py b/redis/__init__.py index 051b039d06..8014e6a4dc 100644 --- a/redis/__init__.py +++ b/redis/__init__.py @@ -1,3 +1,9 @@ +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 +44,7 @@ def int_or_str(value): return value -__version__ = "4.1.0rc2" +__version__ = metadata.version('redis') VERSION = tuple(map(int_or_str, __version__.split("."))) diff --git a/setup.py b/setup.py index b9c2e3e315..9ad3a2a6bd 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ 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 +26,10 @@ 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", From b99f13699b9368af83b1f74bffc7912fbcd8a0a7 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Wed, 15 Dec 2021 11:52:50 +0200 Subject: [PATCH 2/2] defaulting to 99.99.99 when not installed --- redis/__init__.py | 8 ++++++-- setup.py | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/redis/__init__.py b/redis/__init__.py index 8014e6a4dc..35044be29d 100644 --- a/redis/__init__.py +++ b/redis/__init__.py @@ -1,5 +1,6 @@ import sys -if sys.version_info >= (3,8): + +if sys.version_info >= (3, 8): from importlib import metadata else: import importlib_metadata as metadata @@ -44,7 +45,10 @@ def int_or_str(value): return value -__version__ = metadata.version('redis') +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 9ad3a2a6bd..524ea845d1 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",