From 6f506691d7105a58441281106b03882433a37574 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Mon, 25 May 2020 12:48:19 +0800
Subject: [PATCH] bootstrap,requirements.txt: bump up setuptools and requests

Fixes: https://tracker.ceph.com/issues/45691
Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 bootstrap        | 4 ++--
 requirements.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap b/bootstrap
index 018597a..36a5c5b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -64,8 +64,8 @@ ${virtualenv} --python=$(which python3.6) virtualenv
 # avoid pip bugs
 ./virtualenv/bin/pip3 install --upgrade pip
 
-# slightly old version of setuptools; newer fails w/ requests 0.14.0
-./virtualenv/bin/pip3 install setuptools==32.3.1
+# latest setuptools supporting python 2.7
+./virtualenv/bin/pip install setuptools==44.1.0
 
 ./virtualenv/bin/pip3 install -r requirements.txt
 
diff --git a/requirements.txt b/requirements.txt
index 816d146..88e34a5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ munch >=2.0.0
 # 0.14 switches to libev, that means bootstrap needs to change too
 gevent >=1.0
 isodate >=0.4.4
-requests >=0.14.0
+requests >=2.23.0
 pytz >=2011k
 httplib2
 lxml