From 3b68c18810c2e8cea20d7e900064b1f8ec811260 Mon Sep 17 00:00:00 2001 From: Grokzen Date: Sun, 18 Apr 2021 22:43:43 +0200 Subject: [PATCH] Prepare for 2.1.2 hotfix release --- docs/License.txt | 2 +- docs/conf.py | 4 ++-- docs/license.rst | 2 +- docs/release-notes.rst | 6 ++++++ rediscluster/__init__.py | 32 ++++++++++++++++---------------- setup.py | 2 +- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/docs/License.txt b/docs/License.txt index a690495b..b3f0532a 100644 --- a/docs/License.txt +++ b/docs/License.txt @@ -1,4 +1,4 @@ -Copyright (c) 2014-2020 Johan Andersson +Copyright (c) 2014-2021 Johan Andersson Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/docs/conf.py b/docs/conf.py index 547dda77..a180ced3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,9 +59,9 @@ # built documents. # # The short X.Y version. -version = u'2.1.1' +version = u'2.1.2' # The full version, including alpha/beta/rc tags. -release = u'2.1.1' +release = u'2.1.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/license.rst b/docs/license.rst index 854e0526..6c7dcebd 100644 --- a/docs/license.rst +++ b/docs/license.rst @@ -1,7 +1,7 @@ Licensing --------- -Copyright (c) 2013-2020 Johan Andersson +Copyright (c) 2013-2021 Johan Andersson MIT (See docs/License.txt file) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 50795eef..a8786083 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -1,7 +1,13 @@ Release Notes ============= +2.1.2 (Apr 18 2021) +------------------- + + * Fixed bug where "from rediscluster import *" would not work correct + 2.1.1 (Apr 18 2021) +------------------- * ClusterPipeline is now exposed when doing "from rediscluster import *" * Fix issue where connection would be None in some cases when connection pool fails to initialize diff --git a/rediscluster/__init__.py b/rediscluster/__init__.py index 103cc122..e22e3e86 100644 --- a/rediscluster/__init__.py +++ b/rediscluster/__init__.py @@ -33,25 +33,25 @@ def int_or_str(value): # Major, Minor, Fix version -__version__ = '2.1.1' +__version__ = '2.1.2' VERSION = tuple(map(int_or_str, __version__.split('.'))) __all__ = [ - AskError, - ClusterBlockingConnectionPool, - ClusterConnection, - ClusterConnectionPool, - ClusterCrossSlotError, - ClusterDownError, - ClusterDownException, - ClusterError, - ClusterPipeline, - MasterDownError, - MovedError, - RedisCluster, - RedisClusterError, - RedisClusterException, - TryAgainError, + 'AskError', + 'ClusterBlockingConnectionPool', + 'ClusterConnection', + 'ClusterConnectionPool', + 'ClusterCrossSlotError', + 'ClusterDownError', + 'ClusterDownException', + 'ClusterError', + 'ClusterPipeline', + 'MasterDownError', + 'MovedError', + 'RedisCluster', + 'RedisClusterError', + 'RedisClusterException', + 'TryAgainError', ] # Set default logging handler to avoid "No handler found" warnings. diff --git a/setup.py b/setup.py index a49ca2ba..d88b1354 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ setup( name="redis-py-cluster", - version="2.1.1", + version="2.1.2", description="Library for communicating with Redis Clusters. Built on top of redis-py lib", long_description=readme + '\n\n' + history, long_description_content_type="text/markdown",