From 8555e41d5f181cacf626d2dab97d33bf8c2e39dd Mon Sep 17 00:00:00 2001
From: Saikrishna Arcot <sarcot@microsoft.com>
Date: Mon, 18 Oct 2021 20:57:26 -0700
Subject: [PATCH] redis-dump-load: Pin the redis package to use 3.5.3 (#9001)

Redis 4.0.0b1 has been uploaded to pip as a prerelease version. This
version drops support for Python 2 and only supports Python 3. Because
setup.py is being run, it will use the latest version of a package and
not the latest stable version (which is still 3.5.3).

Therefore, pin the redis package to version 3.5.3, so that it will work
for both Python 2 and 3.

#### How to verify it

Make sure that redis-dump-load for Python 2 builds today.
---
 .../0003-use-redis-3.5.3.patch                | 25 +++++++++++++++++++
 src/redis-dump-load.patch/series              |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 src/redis-dump-load.patch/0003-use-redis-3.5.3.patch

diff --git a/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch b/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch
new file mode 100644
index 000000000000..a58c2059e81a
--- /dev/null
+++ b/src/redis-dump-load.patch/0003-use-redis-3.5.3.patch
@@ -0,0 +1,25 @@
+Pin the redis package to version 3.5.3 (the last version that supports both
+Python 2 and 3).
+
+Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
+
+diff --git a/requirements.txt b/requirements.txt
+index 7800f0f..3fc0632 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1 +1 @@
+-redis
++redis==3.5.3
+diff --git a/setup.py b/setup.py
+index 8ccf31f..6db9ec4 100644
+--- a/setup.py
++++ b/setup.py
+@@ -17,7 +17,7 @@ setup(name=package_name,
+     author_email='oleg@bsdpower.com',
+     url='http://github.com/p/redis-dump-load',
+     py_modules=['redisdl'],
+-    install_requires=['redis'],
++    install_requires=['redis==3.5.3'],
+     data_files=[
+         (doc_dir, data_files),
+     ],
diff --git a/src/redis-dump-load.patch/series b/src/redis-dump-load.patch/series
index c73c3b5caa97..50beb71a677f 100644
--- a/src/redis-dump-load.patch/series
+++ b/src/redis-dump-load.patch/series
@@ -1,2 +1,3 @@
 0001-Use-pipelines-when-dumping-52.patch
 0002-Fix-setup.py-for-test-and-bdist_wheel.patch
+0003-use-redis-3.5.3.patch