From 0b6b74257531adb814af83424df22ec007b07dda Mon Sep 17 00:00:00 2001 From: John Sirois Date: Sun, 12 Feb 2023 08:22:28 -0800 Subject: [PATCH 1/3] Support the latest Pip releases: 22.3.1 & 23.0 --- .github/workflows/ci.yml | 20 ++++++++++---------- pex/pip/version.py | 24 ++++++++++++++++++------ tox.ini | 2 +- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32ab67553..c5d97392d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,10 +65,10 @@ jobs: pip-version: 20 - os: ubuntu-20.04 python-version: [ 3, 11 ] - pip-version: 22_2 + pip-version: 22_3_1 - os: ubuntu-20.04 python-version: [ 3, 11 ] - pip-version: 22_3 + pip-version: 23_0 steps: - name: Calculate Pythons to Expose id: calculate-pythons-to-expose @@ -109,9 +109,9 @@ jobs: - pypy-version: [ 3, 9 ] pip-version: 20 - pypy-version: [ 3, 9 ] - pip-version: 22_2 + pip-version: 22_3_1 - pypy-version: [ 3, 9 ] - pip-version: 22_3 + pip-version: 23_0 steps: - name: Calculate Pythons to Expose id: calculate-pythons-to-expose @@ -155,10 +155,10 @@ jobs: pip-version: 20 - os: ubuntu-20.04 python-version: [ 3, 7 ] - pip-version: 22_2 + pip-version: 22_3_1 - os: ubuntu-20.04 python-version: [ 3, 7 ] - pip-version: 22_3 + pip-version: 23_0 - os: macos-11 python-version: [ 3, 11 ] pip-version: 20 @@ -167,10 +167,10 @@ jobs: pip-version: 20 - os: ubuntu-20.04 python-version: [ 3, 11 ] - pip-version: 22_2 + pip-version: 22_3_1 - os: ubuntu-20.04 python-version: [ 3, 11 ] - pip-version: 22_3 + pip-version: 23_0 steps: - name: Calculate Pythons to Expose id: calculate-pythons-to-expose @@ -221,9 +221,9 @@ jobs: - pypy-version: [ 3, 9 ] pip-version: 20 - pypy-version: [ 3, 9 ] - pip-version: 22_2 + pip-version: 22_3_1 - pypy-version: [ 3, 9 ] - pip-version: 22_3 + pip-version: 23_0 steps: - name: Calculate Pythons to Expose id: calculate-pythons-to-expose diff --git a/pex/pip/version.py b/pex/pip/version.py index 24445165b..35e4d75e2 100644 --- a/pex/pip/version.py +++ b/pex/pip/version.py @@ -74,11 +74,12 @@ def values(cls): ), ) + # TODO(John Sirois): Expose setuptools and wheel version flags - these don't affect + # Pex; so we should allow folks to experiment with upgrade easily: + # https://github.com/pantsbuild/pex/issues/1895 + v22_2_2 = PipVersionValue( version="22.2.2", - # TODO(John Sirois): Expose setuptools and wheel version flags - these don't affect - # Pex; so we should allow folks to experiment with upgrade easily: - # https://github.com/pantsbuild/pex/issues/1895 setuptools_version="65.3.0", wheel_version="0.37.1", requires_python=">=3.7", @@ -86,12 +87,23 @@ def values(cls): v22_3 = PipVersionValue( version="22.3", - # TODO(John Sirois): Expose setuptools and wheel version flags - these don't affect - # Pex; so we should allow folks to experiment with upgrade easily: - # https://github.com/pantsbuild/pex/issues/1895 setuptools_version="65.5.0", wheel_version="0.37.1", requires_python=">=3.7", ) + v22_3_1 = PipVersionValue( + version="22.3.1", + setuptools_version="65.5.1", + wheel_version="0.38.2", + requires_python=">=3.7", + ) + + v23_0 = PipVersionValue( + version="23.0", + setuptools_version="67.2.0", + wheel_version="0.38.4", + requires_python=">=3.7", + ) + VENDORED = v20_3_4_patched diff --git a/tox.ini b/tox.ini index 4992f5347..d33b90ffc 100644 --- a/tox.ini +++ b/tox.ini @@ -62,7 +62,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-}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-}integration] deps = pytest-xdist==1.34.0 {[testenv]deps} From 44d4acd511a9a91e07609ba8eff1b577e8d30334 Mon Sep 17 00:00:00 2001 From: John Sirois Date: Sun, 12 Feb 2023 08:30:55 -0800 Subject: [PATCH 2/3] Fixup missing env. --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index d33b90ffc..99bb25437 100644 --- a/tox.ini +++ b/tox.ini @@ -51,6 +51,8 @@ setenv = pip20: _PEX_PIP_VERSION=20.3.4-patched pip22_2: _PEX_PIP_VERSION=22.2.2 pip22_3: _PEX_PIP_VERSION=22.3 + pip22_3_1: _PEX_PIP_VERSION=22.3.1 + pip23_0: _PEX_PIP_VERSION=23.0 # 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 From 93945c00aac9fe7fd4835201df351614fbb46b23 Mon Sep 17 00:00:00 2001 From: John Sirois Date: Sun, 12 Feb 2023 09:18:20 -0800 Subject: [PATCH 3/3] Pip 22.3.1 doesn't work with wheel 0.38 until 0.38.3 which was released after Pip, so pin back. --- pex/pip/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pex/pip/version.py b/pex/pip/version.py index 35e4d75e2..084f35cdb 100644 --- a/pex/pip/version.py +++ b/pex/pip/version.py @@ -95,7 +95,7 @@ def values(cls): v22_3_1 = PipVersionValue( version="22.3.1", setuptools_version="65.5.1", - wheel_version="0.38.2", + wheel_version="0.37.1", requires_python=">=3.7", )