From 0d30ae8f445a4e4f00d94f19d46d4e2a39f151a7 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulip.com>
Date: Fri, 15 Mar 2024 16:24:43 -0700
Subject: [PATCH] requirements: Fix Python 3.12 issue in
 pip._vendor.pkg_resources.

https://github.com/pypa/setuptools/commit/76ef30913dce00de4bca773f2dda9dd25ff66ad8

Signed-off-by: Anders Kaseorg <anders@zulip.com>
---
 requirements/dev.txt  | 4 ++--
 requirements/pip.in   | 2 +-
 requirements/pip.txt  | 4 ++--
 requirements/prod.txt | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/requirements/dev.txt b/requirements/dev.txt
index 4f3c51e5e3..82de6b7c52 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -3456,8 +3456,8 @@ zxcvbn==4.4.28 \
     # via -r requirements/common.in
 
 # The following packages are considered to be unsafe in a requirements file:
-https://github.com/zulip/pip/archive/6642149c44297200f44dfe215b1cb7954d47ed77.zip#egg=pip==20.3.4+git \
-    --hash=sha256:4dfbc892b80b32091921c7cead7c4aff06c726e520633ac89bc463137e0fd27d
+https://github.com/zulip/pip/archive/39e8b5ecfcd8d19872f103d680713bc8e9de9d00.zip#egg=pip==20.3.4+git \
+    --hash=sha256:2c8ae0783fea3e2b98b422d443b19c443779f0881882f905e0728be7b4043d1b
     # via
     #   -r requirements/pip.in
     #   pip-tools
diff --git a/requirements/pip.in b/requirements/pip.in
index 9b7d6b8f80..077c8d2cbf 100644
--- a/requirements/pip.in
+++ b/requirements/pip.in
@@ -1,3 +1,3 @@
-https://github.com/zulip/pip/archive/6642149c44297200f44dfe215b1cb7954d47ed77.zip#egg=pip==20.3.4+git  # Our hack for installing specific commits from Git requires --use-deprecated=legacy-resolver: https://github.com/pypa/pip/issues/5780
+https://github.com/zulip/pip/archive/39e8b5ecfcd8d19872f103d680713bc8e9de9d00.zip#egg=pip==20.3.4+git  # Our hack for installing specific commits from Git requires --use-deprecated=legacy-resolver: https://github.com/pypa/pip/issues/5780
 setuptools
 wheel
diff --git a/requirements/pip.txt b/requirements/pip.txt
index f048fff574..53b8757bd4 100644
--- a/requirements/pip.txt
+++ b/requirements/pip.txt
@@ -13,8 +13,8 @@ wheel==0.42.0 \
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-https://github.com/zulip/pip/archive/6642149c44297200f44dfe215b1cb7954d47ed77.zip#egg=pip==20.3.4+git \
-    --hash=sha256:4dfbc892b80b32091921c7cead7c4aff06c726e520633ac89bc463137e0fd27d
+https://github.com/zulip/pip/archive/39e8b5ecfcd8d19872f103d680713bc8e9de9d00.zip#egg=pip==20.3.4+git \
+    --hash=sha256:2c8ae0783fea3e2b98b422d443b19c443779f0881882f905e0728be7b4043d1b
     # via -r requirements/pip.in
 setuptools==69.1.1 \
     --hash=sha256:02fa291a0471b3a18b2b2481ed902af520c69e8ae0919c13da936542754b4c56 \
diff --git a/requirements/prod.txt b/requirements/prod.txt
index b490e64d04..a277731a09 100644
--- a/requirements/prod.txt
+++ b/requirements/prod.txt
@@ -2413,8 +2413,8 @@ zxcvbn==4.4.28 \
     # via -r requirements/common.in
 
 # The following packages are considered to be unsafe in a requirements file:
-https://github.com/zulip/pip/archive/6642149c44297200f44dfe215b1cb7954d47ed77.zip#egg=pip==20.3.4+git \
-    --hash=sha256:4dfbc892b80b32091921c7cead7c4aff06c726e520633ac89bc463137e0fd27d
+https://github.com/zulip/pip/archive/39e8b5ecfcd8d19872f103d680713bc8e9de9d00.zip#egg=pip==20.3.4+git \
+    --hash=sha256:2c8ae0783fea3e2b98b422d443b19c443779f0881882f905e0728be7b4043d1b
     # via
     #   -r requirements/pip.in
     #   zulip-bots