Merge branch 'unstable'

Grokzen · Nov 16, 2018 · 3842199 · 3842199
2 parents 187838a + 01e2c46
commit 3842199
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Gitter chat room: [![Gitter](https://badges.gitter.im/Grokzen/redis-py-cluster.s
 
 # Documentation
 
-All documentation can be found at http://redis-py-cluster.readthedocs.org/en/master
+All documentation can be found at https://redis-py-cluster.readthedocs.io/en/master
 
 This Readme contains a reduced version of the full documentation.
 

diff --git a/docs/benchmarks.rst b/docs/benchmarks.rst
@@ -1,7 +1,7 @@
 Benchmarks
 ==========
 
-There is a few benchmarks that is designed to test specific parts of the code that will show how big of a performance difference there is between using this lib and the normal Redis client.
+These are a few benchmarks that are designed to test specific parts of the code to demonstrate the performance difference between using this lib and the normal Redis client.
 
 
 
@@ -16,21 +16,21 @@ Install with
     
     pip install -e .
 
-You also need a few redis servers to test against. It is required to have 1 cluster with atleast one node on port `7001` and it also required to have a non-clustered server on port `7007`.
+You also need a few redis servers to test against. You must have one cluster with at least one node on port `7001` and you must also have a non-clustered server on port `7007`.
 
 
 
-Implemented Bencmarks
+Implemented benchmarks
 ---------------------
 
-- `simple.py`, This benchmark can be used to messure a simple `set` and `get` operation chain. It also support running pipelines bu adding the flag `--pipeline`
+- `simple.py`, This benchmark can be used to measure a simple `set` and `get` operation chain. It also supports running pipelines by adding the flag `--pipeline`.
 
 
 
 Run predefined benchmarks
 -------------------------
 
-There is a set of predefined benchmarks that can be runned to messure performance drop from using this library.
+These are a set of predefined benchmarks that can be run to measure the performance drop from using this library.
 
 To run the benchmarks run
 

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
@@ -1,8 +1,14 @@
 Release Notes
 =============
 
+1.3.6 (Nov 16, 2018)
+--------------------
+
+    * Pin upstream redis-py package to release 2.10.6 to avoid issues with incompatible version 3.0.0
+
+
 1.3.5 (July 22, 2018)
---------------
+---------------------
 
     * Add Redis 4 compatability fix to CLUSTER NODES command (See issue #217)
     * Fixed bug with command "CLUSTER GETKEYSINSLOT" that was throwing exceptions

diff --git a/rediscluster/__init__.py b/rediscluster/__init__.py
@@ -16,7 +16,7 @@
 setattr(redis, "StrictClusterPipeline", StrictClusterPipeline)
 
 # Major, Minor, Fix version
-__version__ = (1, 3, 5)
+__version__ = (1, 3, 6)
 
 if sys.version_info[0:3] == (3, 4, 0):
     raise RuntimeError("CRITICAL: rediscluster do not work with python 3.4.0. Please use 3.4.1 or higher.")
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-redis>=2.10.6
+redis==2.10.6
diff --git a/setup.py b/setup.py
@@ -20,8 +20,8 @@
 
 setup(
     name="redis-py-cluster",
-    version="1.3.5",
-    description="Cluster library for redis 3.0.0 built on top of redis-py lib",
+    version="1.3.6",
+    description="Library for communicating with Redis Clusters. Built on top of redis-py lib",
     long_description=readme + '\n\n' + history,
     author="Johan Andersson",
     author_email="[email protected]",
@@ -31,7 +31,7 @@
     url='http://github.com/grokzen/redis-py-cluster',
     license='MIT',
     install_requires=[
-        'redis>=2.10.6'
+        'redis==2.10.6'
     ],
     keywords=[
         'redis',