From 25ce9da31319b8dece5e62afceeab0d6bc80ec40 Mon Sep 17 00:00:00 2001
From: John Sirois <john.sirois@gmail.com>
Date: Sun, 10 Dec 2023 18:46:36 -0600
Subject: [PATCH] Update Python versions. (#2297)

This picks up the 3.11.7 and 3.12.1 releases for both IC range checks
and dtox.sh hermetic builds.
---
 docker/base/install_pythons.sh       |  4 ++--
 pex/interpreter_constraints.py       |  4 ++--
 tests/integration/test_issue_1537.py | 13 ++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/docker/base/install_pythons.sh b/docker/base/install_pythons.sh
index 1ad6a50a0..2555a0242 100755
--- a/docker/base/install_pythons.sh
+++ b/docker/base/install_pythons.sh
@@ -7,7 +7,7 @@ export PYENV_ROOT=/pyenv
 # N.B.: The 1st listed version will supply the default `python` on the PATH; otherwise order does
 # not matter.
 PYENV_VERSIONS=(
-  3.11.6
+  3.11.7
   2.7.18
   3.5.10
   3.6.15
@@ -15,7 +15,7 @@ PYENV_VERSIONS=(
   3.8.18
   3.9.18
   3.10.13
-  3.12.0
+  3.12.1
   pypy2.7-7.3.13
   pypy3.5-7.0.0
   pypy3.6-7.3.3
diff --git a/pex/interpreter_constraints.py b/pex/interpreter_constraints.py
index 08e2848b4..01dcb5875 100644
--- a/pex/interpreter_constraints.py
+++ b/pex/interpreter_constraints.py
@@ -321,8 +321,8 @@ def iter_compatible_versions(
     PythonVersion(Lifecycle.STABLE, 3, 8, 18),
     PythonVersion(Lifecycle.STABLE, 3, 9, 18),
     PythonVersion(Lifecycle.STABLE, 3, 10, 13),
-    PythonVersion(Lifecycle.STABLE, 3, 11, 6),
-    PythonVersion(Lifecycle.STABLE, 3, 12, 0),
+    PythonVersion(Lifecycle.STABLE, 3, 11, 7),
+    PythonVersion(Lifecycle.STABLE, 3, 12, 1),
     PythonVersion(Lifecycle.DEV, 3, 13, 0),
 )
 
diff --git a/tests/integration/test_issue_1537.py b/tests/integration/test_issue_1537.py
index 085ad655f..a3af58b3f 100644
--- a/tests/integration/test_issue_1537.py
+++ b/tests/integration/test_issue_1537.py
@@ -5,9 +5,6 @@
 import shutil
 import subprocess
 
-import pytest
-
-from pex.compatibility import PY3
 from pex.typing import TYPE_CHECKING
 from testing import run_pex_command
 
@@ -15,9 +12,6 @@
     from typing import Any, Callable, ContextManager, Tuple
 
 
-@pytest.mark.skipif(
-    condition=not PY3, reason="Test relies on a distribution that is Python 3 only."
-)
 def test_rel_cert_path(
     run_proxy,  # type: Callable[[], ContextManager[Tuple[int, str]]]
     tmpdir,  # type: Any
@@ -32,7 +26,12 @@ def test_rel_cert_path(
                 "http://localhost:{port}".format(port=port),
                 "--cert",
                 "cert",
-                "avro-python3==1.10.0",
+                # N.B.: The original issue (https://github.com/pantsbuild/pex/issues/1537) involved
+                # avro-python3 1.10.0, but that distribution utilizes setup_requires which leads to
+                # issues in CI for Mac. We use the Python 2/3 version of the same distribution
+                # instead, which had setup_requires removed in
+                # https://github.com/apache/avro/pull/818.
+                "avro==1.10.0",
                 "-o",
                 pex_file,
             ]