Add support for Pip 24.0.

The release notes are here: https://pip.pypa.io/en/stable/news/#v24-0
jsirois · Feb 5, 2024 · e1f4b8c · e1f4b8c
1 parent 33adf84
commit e1f4b8c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -60,8 +60,8 @@ jobs:
           - py311-pip20
           - py311-pip22_3_1
           - py311-pip23_1_2
-          - py312-pip23_3_2
-          - py313-pip24_0
+          - py312-pip24_0
+          - py313-pip24_0_patched
           - pypy310-pip20
           - pypy310-pip22_3_1
           - pypy310-pip23_1_2
@@ -71,8 +71,8 @@ jobs:
           - py311-pip20-integration
           - py311-pip22_3_1-integration
           - py311-pip23_1_2-integration
-          - py312-pip23_3_2-integration
-          - py313-pip24_0-integration
+          - py312-pip24_0-integration
+          - py313-pip24_0_patched-integration
           - pypy310-pip20-integration
           - pypy310-pip22_3_1-integration
           - pypy310-pip23_1_2-integration
@@ -116,10 +116,10 @@ jobs:
       matrix:
         include:
           - python-version: [ 3, 12 ]
-            tox-env: py312-pip23_3_2
+            tox-env: py312-pip24_0
             tox-env-python: python3.11
           - python-version: [ 3, 12 ]
-            tox-env: py312-pip23_3_2-integration
+            tox-env: py312-pip24_0-integration
             tox-env-python: python3.11
     steps:
       - name: Calculate Pythons to Expose

diff --git a/pex/pip/version.py b/pex/pip/version.py
@@ -248,6 +248,15 @@ def values(cls):
         requires_python=">=3.7,<3.13",
     )
 
+    v24_0 = PipVersionValue(
+        version="24.0",
+        # N.B.: The setuptools 69.0.3 release was available on 2/03/2024 (the Pip 24.0 release
+        # date) but 68.0.0 is the last setuptools version to support 3.7.
+        setuptools_version="68.0.0",
+        wheel_version="0.42.0",
+        requires_python=">=3.7,<3.13",
+    )
+
     # This is https://github.com/pypa/pip/pull/12462 which is approved but not yet merged or
     # released. It allows testing Python 3.13 pre-releases but should not be used by the public; so
     # we keep it hidden.

diff --git a/tox.ini b/tox.ini
@@ -62,10 +62,11 @@ setenv =
     pip23_2: _PEX_PIP_VERSION=23.2
     pip23_3_1: _PEX_PIP_VERSION=23.3.1
     pip23_3_2: _PEX_PIP_VERSION=23.3.2
+    pip24_0: _PEX_PIP_VERSION=24.0
 
     # This Pip and custom Requires-Python are just here to support un-released Python 3.13 testing.
-    pip24_0: _PEX_PIP_VERSION=24.0.dev0-patched
-    pip24_0: _PEX_REQUIRES_PYTHON=>=2.7,<3.14,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
+    pip24_0_patched: _PEX_PIP_VERSION=24.0.dev0-patched
+    pip24_0_patched: _PEX_REQUIRES_PYTHON=>=2.7,<3.14,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
 
     # 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
@@ -78,7 +79,7 @@ whitelist_externals =
     bash
     git
 
-[testenv:py{py27-subprocess,py27,py35,py36,py37,py38,py39,py310,27,35,36,37,38,39,310,311,312,313}-{,pip20-,pip22_2-,pip22_3-,pip22_3_1-,pip23_0-,pip23_0_1-,pip23_1-,pip23_1_1-,pip23_1_2-,pip23_2-,pip23_3_1-,pip23_3_2-,pip24_0-}integration]
+[testenv:py{py27-subprocess,py27,py35,py36,py37,py38,py39,py310,27,35,36,37,38,39,310,311,312,313}-{,pip20-,pip22_2-,pip22_3-,pip22_3_1-,pip23_0-,pip23_0_1-,pip23_1-,pip23_1_1-,pip23_1_2-,pip23_2-,pip23_3_1-,pip23_3_2-,pip24_0-,pip24_0_patched-}integration]
 deps =
     pytest-xdist==1.34.0
     {[testenv]deps}