From 19554d3b08858c5b29de17b21ae78bd5a3722621 Mon Sep 17 00:00:00 2001
From: John Sirois <john.sirois@gmail.com>
Date: Wed, 26 Apr 2023 06:51:50 -0700
Subject: [PATCH] Add Support for Pip 23.1.1. (#2133)

The release notes are here:
  https://pip.pypa.io/en/stable/news/#v23-1-1
---
 .github/workflows/ci.yml | 10 +++++-----
 pex/pip/version.py       |  7 +++++++
 tox.ini                  |  3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 53fd05231..4773748d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,7 +68,7 @@ jobs:
             pip-version: 22_3_1
           - os: ubuntu-20.04
             python-version: [ 3, 11 ]
-            pip-version: 23_1
+            pip-version: 23_1_1
     steps:
       - name: Calculate Pythons to Expose
         id: calculate-pythons-to-expose
@@ -111,7 +111,7 @@ jobs:
           - pypy-version: [ 3, 9 ]
             pip-version: 22_3_1
           - pypy-version: [ 3, 9 ]
-            pip-version: 23_1
+            pip-version: 23_1_1
     steps:
       - name: Calculate Pythons to Expose
         id: calculate-pythons-to-expose
@@ -158,7 +158,7 @@ jobs:
             pip-version: 22_3_1
           - os: ubuntu-20.04
             python-version: [ 3, 7 ]
-            pip-version: 23_1
+            pip-version: 23_1_1
           - os: macos-11
             python-version: [ 3, 11 ]
             pip-version: 20
@@ -170,7 +170,7 @@ jobs:
             pip-version: 22_3_1
           - os: ubuntu-20.04
             python-version: [ 3, 11 ]
-            pip-version: 23_1
+            pip-version: 23_1_1
     steps:
       - name: Calculate Pythons to Expose
         id: calculate-pythons-to-expose
@@ -223,7 +223,7 @@ jobs:
           - pypy-version: [ 3, 9 ]
             pip-version: 22_3_1
           - pypy-version: [ 3, 9 ]
-            pip-version: 23_1
+            pip-version: 23_1_1
     steps:
       - name: Calculate Pythons to Expose
         id: calculate-pythons-to-expose
diff --git a/pex/pip/version.py b/pex/pip/version.py
index 925744ac6..39a9ada26 100644
--- a/pex/pip/version.py
+++ b/pex/pip/version.py
@@ -131,5 +131,12 @@ def values(cls):
         requires_python=">=3.7",
     )
 
+    v23_1_1 = PipVersionValue(
+        version="23.1.1",
+        setuptools_version="67.7.1",
+        wheel_version="0.40.0",
+        requires_python=">=3.7",
+    )
+
     VENDORED = v20_3_4_patched
     LATEST = LatestPipVersion()
diff --git a/tox.ini b/tox.ini
index bb4dcb8d1..f8bb71f21 100644
--- a/tox.ini
+++ b/tox.ini
@@ -55,6 +55,7 @@ setenv =
     pip23_0: _PEX_PIP_VERSION=23.0
     pip23_0_1: _PEX_PIP_VERSION=23.0.1
     pip23_1: _PEX_PIP_VERSION=23.1
+    pip23_1_1: _PEX_PIP_VERSION=23.1.1
     # Python 3 (until a fix here in 3.9: https://bugs.python.org/issue13601) switched from stderr
     # being unbuffered to stderr being buffered by default. This can lead to tests checking stderr
     # failing to see what they expect if the stderr buffer block has not been flushed. Force stderr
@@ -66,7 +67,7 @@ whitelist_externals =
     bash
     git
 
-[testenv:py{py27-subprocess,py27,py35,py36,py37,py38,py39,27,35,36,37,38,39,310,311}-{,pip20-,pip22_2-,pip22_3-,pip22_3_1-,pip23_0-,pip23_0_1-,pip23_1-}integration]
+[testenv:py{py27-subprocess,py27,py35,py36,py37,py38,py39,27,35,36,37,38,39,310,311}-{,pip20-,pip22_2-,pip22_3-,pip22_3_1-,pip23_0-,pip23_0_1-,pip23_1-,pip23_1_1-}integration]
 deps =
     pytest-xdist==1.34.0
     {[testenv]deps}