From: Anil Belur <abelur@linuxfoundation.org>
Date: Mon, 25 Oct 2021 10:40:08 +0000 (+1000)
Subject: Fix: Pin pyparsing<3.0.0 required by httplib2
X-Git-Tag: v0.68.1^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?p=releng%2Fglobal-jjb.git;a=commitdiff_plain;h=e3b4365df52fdf3fdd6abe86a7fcc4b06c29e181

Fix: Pin pyparsing<3.0.0 required by httplib2

Pin pyparsing<3.0.0 required by httplib2 0.20.1. A new version
of pip 21.3.1 is out that has removed this dependency
(pyparsing<3,>=2.4.2) as required by httplib2.

Issue-ID: RELENG-4022
Change-Id: Ifc00a6c82f82b57768330b491828a159be561679
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/releasenotes/notes/pin-httplib2-dependencies-b29d15d8a674cb43.yaml b/releasenotes/notes/pin-httplib2-dependencies-b29d15d8a674cb43.yaml
new file mode 100644
index 00000000..8d06e03d
--- /dev/null
+++ b/releasenotes/notes/pin-httplib2-dependencies-b29d15d8a674cb43.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Pin pyparsing<3.0.0 which is required by httplib2 0.20.1.
+    A new version of pip 21.3.1 is out that has removed
+    the dependency pyparsing<3,>=2.4.2 as required by httplib2.
diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 7abaed9e..20a63600 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -38,6 +38,7 @@ yq
 # necessary so that future maintainers of this file can make decisions to
 # remove the workarounds in the future.
 importlib-resources<2.0.0  # virtualenv 20.0.21 requires importlib-resources<2.0.0 (RELENG-2993)
+pyparsing<3.0.0 # httplib2 0.20.1 requires pyparsing<3,>=2.4.2
 EOF
 
     #Python 3.5 in Ubuntu 16.04 workaround