From e58fe8d6279aa9f62973fd8fa3708b4f97ff2b29 Mon Sep 17 00:00:00 2001 From: Kefu Chai 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 (cherry picked from commit b7f47c2a31ce6d6bd4dfff96ff1198c52594a46f) Conflicts: bootstrap: trivial resolution --- bootstrap | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap b/bootstrap index d7e66dc..d929f11 100755 --- a/bootstrap +++ b/bootstrap @@ -39,8 +39,8 @@ virtualenv --no-site-packages --distribute virtualenv # avoid pip bugs ./virtualenv/bin/pip install --upgrade pip -# slightly old version of setuptools; newer fails w/ requests 0.14.0 -./virtualenv/bin/pip install setuptools==32.3.1 +# latest setuptools supporting python 2.7 +./virtualenv/bin/pip install setuptools==44.1.0 ./virtualenv/bin/pip install -r requirements.txt diff --git a/requirements.txt b/requirements.txt index 606e392..bb500f2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ bunch >=1.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 ordereddict httplib2