Merge pull request #3514 from native-api/add_macos_26_intel

CI: Add macos_26_intel

.github/workflows/modified_scripts_build.yml

@@ -2,7 +2,7 @@ name: modified_scripts
 on: [pull_request]
 jobs:
   discover_modified_scripts:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     outputs:
       versions: ${{steps.modified-versions.outputs.versions}}
       versions_cpython_only: ${{steps.modified-versions.outputs.versions_cpython_only}}
@@ -43,28 +43,32 @@ jobs:
           import packaging.version
           
           result=[]
+          def exclude_macos_intel(result, python_version):
+            result.append({'os':'macos-15-intel','python-version':python_version})
+            result.append({'os':'macos-26-intel','python-version':python_version})          
+          
           
           for line in os.environ['versions'].splitlines():
-            if m:=re.match(r'([^-]+)-(\d+\.\d+)-(\d+\.\d+.\d+)', line):
+            if m:=re.match(r'miniconda3-\d+\.\d+-(\d+\.\d+\.\d+)', line):
-              name, version = m.group(1), packaging.version.Version(m.group(3))
+              version = packaging.version.Version(m.group(1))
               
               # Miniconda dropped MacOS x64 support
-              if (name == 'miniconda3' and version >= packaging.version.Version('25.9.1')):
+              if version >= packaging.version.Version('25.9.1'):
-                result.append({'os':'macos-15-intel','python-version':line})
+                exclude_macos_intel(result, line)
             
-            if m:=re.match(r'([^-]+)-(\d+\.\d+)', line):
+            if m:=re.match(r'anaconda3-(\d+\.\d+)', line):
-              name, version = m.group(1), packaging.version.Version(m.group(2))
+              version = packaging.version.Version(m.group(1))
               
               # Anaconda dropped MacOS x64 support
-              if name == 'anaconda3' and version >= packaging.version.Version('2025.12'):
+              if version >= packaging.version.Version('2025.12'):
-                result.append({'os':'macos-15-intel','python-version':line})
+                exclude_macos_intel(result, line)
           
-            if m:=re.match(r'graalpy[^-]*-(community-)?(\d+\.\d+.\d+)', line):
+            if m:=re.match(r'graalpy[^-]*-(community-)?(\d+\.\d+\.\d+)', line):
               version = packaging.version.Version(m.group(2))
               
               # GraalPy dropped MacOS x64 support
               if version >= packaging.version.Version('25.0.2'):
-                result.append({'os':'macos-15-intel','python-version':line})
+                exclude_macos_intel(result, line)
               
           
           EOF = str(random.getrandbits(15*8))
@@ -91,6 +95,7 @@ jobs:
           - macos-15
           - macos-15-intel
           - macos-26
+          - macos-26-intel
         exclude: ${{fromJson(needs.discover_modified_scripts.outputs.versions_macos_build_exclude)}}
     runs-on: ${{ matrix.os }}
     steps:
@@ -153,7 +158,12 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions_cpython_only)}}
-        os: ["macos-14", "macos-15", "macos-15-intel"]
+        os:
+          - macos-14
+          - macos-15
+          - macos-15-intel
+          - macos-26
+          - macos-26-intel
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v7
@@ -165,12 +175,7 @@ jobs:
       - run: |
           #prerequisites
           brew install sqlite3 xz tcl-tk@8 libb2 zstd
-          "$GITHUB_WORKSPACE/.github/workflows/scripts/brew-uninstall-cascade.sh" openssl@3 openssl@1.1 readline
+          "$GITHUB_WORKSPACE/.github/workflows/scripts/brew-uninstall-cascade.sh" $(brew list | grep -E '^openssl(@|$)') readline
-          if [[ "${{ matrix.python-version }}" =~ pypy.*-(src|dev) ]]; then
-            export PYENV_BOOTSTRAP_VERSION=pypy2.7-7
-            echo "PYENV_BOOTSTRAP_VERSION=$PYENV_BOOTSTRAP_VERSION" >> $GITHUB_ENV
-            pyenv install $PYENV_BOOTSTRAP_VERSION
-          fi
       - run: |
           #build
           pyenv --debug install ${{ matrix.python-version }} && rc=$? || rc=$?
@@ -274,18 +279,13 @@ jobs:
           export PYENV_ROOT="$GITHUB_WORKSPACE"
           echo "PYENV_ROOT=$PYENV_ROOT" >> $GITHUB_ENV
           echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
-          echo "_PYTHON_BUILD_FORCE_SKIP_XZ=1" >> $GITHUB_PATH
+          echo "_PYTHON_BUILD_FORCE_SKIP_XZ=1" >> $GITHUB_ENV
       - run: |
           #prerequisites
           sudo apt-get update -q; sudo apt-get install -yq make build-essential \
             libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev \
-            curl llvm libncurses5-dev libncursesw5-dev \
+            curl libncursesw5-dev \
             xz-utils tk-dev libffi-dev liblzma-dev
-          if [[ "${{ matrix.python-version }}" =~ pypy.*-(src|dev) ]]; then
-            export PYENV_BOOTSTRAP_VERSION=pypy2.7-7
-            echo "PYENV_BOOTSTRAP_VERSION=$PYENV_BOOTSTRAP_VERSION" >> $GITHUB_ENV
-            pyenv install $PYENV_BOOTSTRAP_VERSION
-          fi
       - run: |
           #build
           pyenv --debug install ${{ matrix.python-version }} && rc=$? || rc=$?

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Version History
 
+## Release v2.8.3
+* Add CPython 3.13.15, 3.14.7 by @pyenv-bot[bot] in https://github.com/pyenv/pyenv/pull/3512
+
 ## Release v2.8.2
 * pyenv-binary: add the `package` subcommand; add `pyenv install --list --bare` by @macayu17 in https://github.com/pyenv/pyenv/pull/3498
 * Add graalpy3.12-25.2.4 by @msimacek in https://github.com/pyenv/pyenv/pull/3502

libexec/pyenv---version

@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-version="2.8.2"
+version="2.8.3"
 git_revision=""
 
 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then

plugins/python-build/bin/python-build

@@ -14,7 +14,7 @@
 #   -g/--debug       Build a debug version
 #
 
-PYTHON_BUILD_VERSION="2.8.2"
+PYTHON_BUILD_VERSION="2.8.3"
 
 OLDIFS="$IFS"
 

plugins/python-build/share/python-build/3.13.15

@@ -0,0 +1,11 @@
+prefer_openssl3
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL_RPATH=1
+export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
+install_package "openssl-3.6.3" "https://github.com/openssl/openssl/releases/download/openssl-3.6.3/openssl-3.6.3.tar.gz#243a86649cf6f23eeb6a2ff2456e09e5d77dd9018a54d3d96b0c6bdd6ba6c7f1" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.3" "https://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+    install_package "Python-3.13.15" "https://www.python.org/ftp/python/3.13.15/Python-3.13.15.tar.xz#1e66a7945a48390ee4c2a4268a0e4185884059a13c4aab6d148aa208deea4a76" standard verify_py313 copy_python_gdb ensurepip
+else
+    install_package "Python-3.13.15" "https://www.python.org/ftp/python/3.13.15/Python-3.13.15.tgz#c28d9d213c09b5b5ab2c29812950e12f746999e099b82894231be954b26baed9" standard verify_py313 copy_python_gdb ensurepip
+fi

plugins/python-build/share/python-build/3.13.15t

@@ -0,0 +1,2 @@
+export PYTHON_BUILD_FREE_THREADING=1
+source "${BASH_SOURCE[0]%t}"

plugins/python-build/share/python-build/3.14.7

@@ -0,0 +1,11 @@
+prefer_openssl3_to_4
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL_RPATH=1
+export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
+install_package "openssl-4.0.1" "https://github.com/openssl/openssl/releases/download/openssl-4.0.1/openssl-4.0.1.tar.gz#2db3f3a0d6ea4b59e1f094ace2c8cd536dffb87cdc39084c5afa1e6f7f37dd09" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.3" "https://ftpmirror.gnu.org/readline/readline-8.3.tar.gz#fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+    install_package "Python-3.14.7" "https://www.python.org/ftp/python/3.14.7/Python-3.14.7.tar.xz#3b48dac8fb59f62eaa67ac83c1eb12bda1b7a08406dd286e252c11a66be27f81" standard verify_py314 copy_python_gdb ensurepip
+else
+    install_package "Python-3.14.7" "https://www.python.org/ftp/python/3.14.7/Python-3.14.7.tgz#62859805f6fdf25e2bcbf3fa3217801e1996887ca33e6a2af80674bdfa2dbe07" standard verify_py314 copy_python_gdb ensurepip
+fi

plugins/python-build/share/python-build/3.14.7t

@@ -0,0 +1,2 @@
+export PYTHON_BUILD_FREE_THREADING=1
+source "${BASH_SOURCE[0]%t}"

plugins/python-build/share/python-build/patches/3.14.7t

@@ -0,0 +1 @@
+3.14.7