2026-09-10 15:46:17 -04:00
294 changed files with 776 additions and 86882 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -3,6 +3,9 @@ Make sure you have checked all steps below.
 ### Prerequisite
 * [ ] Please consider implementing the feature as a hook script or plugin as a first step.
  * pyenv has some powerful support for plugins and hook scripts. Please refer to [Authoring plugins](https://github.com/pyenv/pyenv/wiki/Authoring-plugins) for details and try to implement it as a plugin if possible.
+* [ ] Please consider contributing the patch upstream to [rbenv](https://github.com/rbenv/rbenv), since we have borrowed most of the code from that project.
+  * We occasionally import the changes from rbenv. In general, you can expect changes made in rbenv will be imported to pyenv too, eventually.
+  * Generally speaking, we prefer not to make changes in the core in order to keep compatibility with rbenv.
 * [ ] My PR addresses the following pyenv issue (if any)
  - Closes https://github.com/pyenv/pyenv/issues/XXXX

--- a/.github/actions/build-python/action.yml
+++ b/.github/actions/build-python/action.yml
@ -1,44 +0,0 @@
-name: Build a Python version
-description: >
-  Install python-build's system dependencies for the current runner's OS, build
-  and check the requested version.
-inputs:
-  python-version:
-    description: A version as accepted by `pyenv install`.
-    required: true
-runs:
-  using: composite
-  steps:
-    - shell: bash
-      run: |
-        #envvars
-        export PYENV_ROOT="$GITHUB_WORKSPACE"
-        echo "PYENV_ROOT=$PYENV_ROOT" >> $GITHUB_ENV
-        echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
-    # The two OSes differ only in this step.
-    - if: runner.os == 'macOS'
-      shell: bash
-      run: |
-        #prerequisites
-        brew install openssl readline sqlite3 xz tcl-tk@8 libb2 zstd
-    - if: runner.os == 'Linux'
-      shell: bash
-      run: |
-        #prerequisites
-        pyenv install-prerequisites
-    - shell: bash
-      run: |
-        #build
-        pyenv --debug install ${{ inputs.python-version }} && rc=$? || rc=$?
-        if [[ $rc -ne 0 ]]; then echo config.log:; cat "${TMPDIR:-/tmp}"/python-build*/*/config.log; false; fi
-        pyenv global ${{ inputs.python-version }}
-        pyenv rehash
-    - shell: bash
-      run: |
-        #print version
-        python --version
-        python -m pip --version
-    - shell: python  # Prove that actual Python == expected Python
-      env:
-        EXPECTED_PYTHON: ${{ inputs.python-version }}
-      run: import os, sys ; assert sys.version.startswith(os.getenv("EXPECTED_PYTHON"))
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -4,8 +4,6 @@ updates:
    directory: "/"
    schedule:
      interval: "monthly"
-    cooldown:
-      default-days: 7
    groups:
      github-actions:
        patterns:
--- a/.github/scripts/generate_release_notes_sponsors.py
+++ b/.github/scripts/generate_release_notes_sponsors.py
@ -1,364 +0,0 @@
-#!/usr/bin/env python3
-"""Generate a "Sponsors since <date>" section for release notes.
-
-Queries GitHub Sponsors and OpenCollective for new sponsors since the latest
-pyenv release or one month ago, whichever is longer. The output is Markdown
-suitable for GitHub Releases.
-
-Requirements:
-* Python 3.8+
-* The ``gh`` CLI authenticated with the ``read:user`` scope.
-* Network access to https://opencollective.com.
-"""
-
-import argparse
-import calendar
-import datetime
-import json
-import pathlib
-import subprocess
-import sys
-import typing
-import urllib.error
-import urllib.request
-
-
-GITHUB_ORG = "pyenv"
-OPENCOLLECTIVE_MEMBERS_URL = "https://opencollective.com/pyenv/members.json"
-
-
-class SponsorDataError(RuntimeError):
-    """Raised when a sponsors data source cannot be queried or parsed."""
-
-
-def parse_date(value: str) -> datetime.date:
-    return datetime.datetime.fromisoformat(value).date()
-
-
-def one_month_ago(today: typing.Optional[datetime.date] = None) -> datetime.date:
-    today = today or datetime.date.today()
-    year = today.year
-    month = today.month - 1
-    if month == 0:
-        year -= 1
-        month = 12
-    try:
-        return datetime.date(year, month, today.day)
-    except ValueError:
-        last_day = calendar.monthrange(year, month)[1]
-        return datetime.date(year, month, last_day)
-
-
-def latest_release_date() -> datetime.date:
-    """Return the publish date of the latest GitHub release."""
-    latest_release_error = None
-    try:
-        result = subprocess.run(
-            ["gh", "api", f"repos/{GITHUB_ORG}/{GITHUB_ORG}/releases/latest"],
-            capture_output=True,
-            text=True,
-            check=True,
-        )
-        data = json.loads(result.stdout)
-        published = data["published_at"].replace("Z", "+00:00")
-        return datetime.datetime.fromisoformat(published).date()
-    except (
-        subprocess.CalledProcessError,
-        OSError,
-        json.JSONDecodeError,
-        KeyError,
-    ) as exc:
-        latest_release_error = exc
-
-    try:
-        tag = subprocess.run(
-            ["git", "describe", "--tags", "--abbrev=0"],
-            capture_output=True,
-            text=True,
-            check=True,
-        ).stdout.strip()
-        date_str = subprocess.run(
-            ["git", "log", "-1", "--format=%cI", tag],
-            capture_output=True,
-            text=True,
-            check=True,
-        ).stdout.strip()
-        return datetime.datetime.fromisoformat(date_str).date()
-    except (subprocess.CalledProcessError, OSError) as exc:
-        detail = ""
-        if latest_release_error is not None:
-            detail = f" GitHub release lookup failed first: {latest_release_error}."
-        raise SponsorDataError(
-            "Could not determine the latest release date. "
-            "Pass --since explicitly or run from a clone with release tags."
-            f"{detail}"
-        ) from exc
-
-
-def compute_since_date(explicit_since: typing.Optional[datetime.date]) -> datetime.date:
-    if explicit_since is not None:
-        return explicit_since
-    return min(latest_release_date(), one_month_ago())
-
-
-def github_sponsors(since: datetime.date) -> typing.List[typing.Dict]:
-    """Return GitHub Sponsors created on or after *since*."""
-    query = """
-    query($org: String!, $after: String) {
-      organization(login: $org) {
-        sponsorshipsAsMaintainer(
-          first: 100,
-          after: $after,
-          activeOnly: false,
-          orderBy: {field: CREATED_AT, direction: DESC}
-        ) {
-          pageInfo {
-            hasNextPage
-            endCursor
-          }
-          nodes {
-            createdAt
-            sponsorEntity {
-              ... on User { login, name }
-              ... on Organization { login, name }
-            }
-          }
-        }
-      }
-    }
-    """
-    since_dt = datetime.datetime.combine(
-        since, datetime.time.min, tzinfo=datetime.timezone.utc
-    )
-    sponsors = []
-    cursor = None
-    while True:
-        command = [
-            "gh",
-            "api",
-            "graphql",
-            "-F",
-            f"org={GITHUB_ORG}",
-            "-f",
-            f"query={query}",
-        ]
-        if cursor is not None:
-            command.extend(["-F", f"after={cursor}"])
-
-        result = subprocess.run(
-            command,
-            capture_output=True,
-            text=True,
-        )
-        if result.returncode != 0:
-            detail = result.stderr.strip() or result.stdout.strip() or "no output"
-            raise SponsorDataError(
-                "GitHub Sponsors query failed. "
-                "Check that `gh auth status` shows access to the pyenv org "
-                "and that the token has the scopes required to read sponsorships. "
-                f"`gh api graphql` exited {result.returncode}: {detail}"
-            )
-
-        try:
-            data = json.loads(result.stdout)
-        except json.JSONDecodeError as exc:
-            raise SponsorDataError(
-                "GitHub Sponsors query returned invalid JSON."
-            ) from exc
-
-        if "errors" in data:
-            raise SponsorDataError(
-                f"GitHub Sponsors query returned errors: {data['errors']}"
-            )
-
-        try:
-            sponsorships = data["data"]["organization"]["sponsorshipsAsMaintainer"]
-        except (TypeError, KeyError) as exc:
-            raise SponsorDataError(
-                "GitHub Sponsors query returned an unexpected response shape."
-            ) from exc
-        try:
-            nodes = sponsorships["nodes"]
-            page_info = sponsorships["pageInfo"]
-        except (TypeError, KeyError) as exc:
-            raise SponsorDataError(
-                "GitHub Sponsors query returned incomplete pagination data."
-            ) from exc
-
-        for node in nodes:
-            try:
-                created = datetime.datetime.fromisoformat(
-                    node["createdAt"].replace("Z", "+00:00")
-                )
-                entity = node["sponsorEntity"]
-                login = entity["login"]
-            except (AttributeError, KeyError, TypeError, ValueError) as exc:
-                raise SponsorDataError(
-                    "GitHub Sponsors query returned an unexpected sponsor record."
-                ) from exc
-            if created < since_dt:
-                return sponsors
-            sponsors.append({
-                "login": login,
-                "name": entity.get("name") or login,
-            })
-
-        try:
-            has_next_page = page_info["hasNextPage"]
-            cursor = page_info["endCursor"]
-        except (TypeError, KeyError) as exc:
-            raise SponsorDataError(
-                "GitHub Sponsors query returned incomplete pagination data."
-            ) from exc
-        if not has_next_page:
-            return sponsors
-
-
-def opencollective_sponsors(since: datetime.date, data: typing.Union[str, None]) -> typing.List[typing.Dict]:
-    """Return OpenCollective backers active on or after *since*."""
-    if data is None:
-        req = urllib.request.Request(
-            f"{OPENCOLLECTIVE_MEMBERS_URL}?limit=1000",
-            headers={"User-Agent": f"{GITHUB_ORG}/release-notes-sponsors"},
-        )
-        try:
-            with urllib.request.urlopen(req, timeout=30) as resp:
-                data = resp.read()
-        except urllib.error.HTTPError as exc:
-            raise SponsorDataError(
-                f"OpenCollective sponsors query failed for {OPENCOLLECTIVE_MEMBERS_URL}: "
-                f"HTTP {exc.code} {exc.reason}"
-            ) from exc
-        except urllib.error.URLError as exc:
-            raise SponsorDataError(
-                f"OpenCollective sponsors query failed for {OPENCOLLECTIVE_MEMBERS_URL}: "
-                f"{exc.reason}"
-            ) from exc
-    try:
-        members = json.loads(data)
-    except json.JSONDecodeError as exc:
-        raise SponsorDataError(
-            "OpenCollective sponsors query returned invalid JSON."
-        ) from exc
-
-    since_dt = datetime.datetime.combine(since, datetime.time.min)
-    sponsors = []
-    for member in members:
-        if member.get("role") != "BACKER":
-            continue
-        try:
-            last_transaction_at = datetime.datetime.strptime(member["lastTransactionAt"], "%Y-%m-%d %H:%M")
-            profile = member["profile"].rstrip("/")
-        except (KeyError, TypeError, ValueError) as exc:
-            raise SponsorDataError(
-                "OpenCollective sponsors query returned an unexpected member record."
-            ) from exc
-        if last_transaction_at < since_dt:
-            continue
-        slug = profile.split("/")[-1]
-        if slug == "github-sponsors":
-            # Listed separately under GitHub Sponsors.
-            continue
-        sponsors.append({
-            "name": member.get("name") or slug,
-            "profile": profile,
-        })
-    return sponsors
-
-
-def render(
-    since: datetime.date,
-    gh_sponsors: typing.List[typing.Dict],
-    oc_sponsors: typing.List[typing.Dict],
-) -> str:
-    lines = [f"## Sponsors since {since.isoformat()}", ""]
-
-    if gh_sponsors:
-        lines.append("### GitHub Sponsors")
-        for sponsor in gh_sponsors:
-            lines.append(
-                markdown_link(
-                    sponsor["name"],
-                    f"https://github.com/{sponsor['login']}",
-                )
-            )
-        lines.append("")
-
-    if oc_sponsors:
-        lines.append("### Open Collective")
-        for sponsor in oc_sponsors:
-            lines.append(markdown_link(sponsor["name"], sponsor["profile"]))
-        lines.append("")
-
-    if not gh_sponsors and not oc_sponsors:
-        lines.append("*No new sponsors in this period.*")
-        lines.append("")
-
-    return "\n".join(lines)
-
-
-def markdown_link(text: str, url: str) -> str:
-    escaped_text = escape_markdown_text(text)
-    escaped_url = url.replace(")", "%29")
-    return f"- [{escaped_text}]({escaped_url})"
-
-
-def escape_markdown_text(text: str) -> str:
-    escaped = text.replace("\\", "\\\\")
-    for char in r"`*_{}[]()#+-.!|>":
-        escaped = escaped.replace(char, f"\\{char}")
-    return escaped
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser(
-        description="Generate a sponsors section for GitHub release notes."
-    )
-    parser.add_argument(
-        "--since",
-        type=parse_date,
-        metavar="YYYY-MM-DD",
-        help="Include sponsors created on or after this date.",
-    )
-    parser.add_argument(
-        "--output",
-        metavar="FILE",
-        help="Write the section to FILE instead of stdout.",
-    )
-    parser.add_argument(
-        "--skip-opencollective",
-        action="store_true",
-        help="Skip OpenCollective backers if the members endpoint is unavailable.",
-    )
-    parser.add_argument(
-        "--opencollective-data",
-        metavar="FILE",
-        help="Take OpenCollective API reply from FILE.",
-    )
-    args = parser.parse_args()
-
-    try:
-        since = compute_since_date(args.since)
-        oc_sponsors = []
-        if not args.skip_opencollective:
-            manual_data = (
-                pathlib.Path(args.opencollective_data).read_text()) \
-                if args.opencollective_data \
-                else None
-            oc_sponsors = opencollective_sponsors(since, manual_data)
-        section = render(since, github_sponsors(since), oc_sponsors)
-    except SponsorDataError as exc:
-        print(f"error: {exc}", file=sys.stderr)
-        return 1
-
-    if args.output:
-        with open(args.output, "w", encoding="utf-8") as f:
-            f.write(section)
-    else:
-        print(section, end="")
-
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())
--- a/.github/workflows/add_version.yml
+++ b/.github/workflows/add_version.yml
@ -4,7 +4,7 @@ on:
  workflow_dispatch: {}
  schedule:
    # Every N hours
-    - cron: '25 */4 * * *'
+    - cron: '0 */4 * * *'

 permissions:
  contents: write
@ -12,10 +12,10 @@ permissions:

 jobs:
  add_cpython:
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
        with:
          python-version: 3
          cache: 'pip'
@ -25,8 +25,6 @@ jobs:
      - name: check for a release
        run: |
          python plugins/python-build/scripts/add_cpython.py --verbose >added_versions.lst && rc=$? || rc=$?
-          #0 means new version found, 1 not found, 2 another error
-          [[ $rc -gt 1 ]] && false
          echo "rc=$rc" >> $GITHUB_ENV
      - name: set PR properties
        if: env.rc == 0
@ -54,5 +52,4 @@ jobs:
        with:
          branch: ${{ env.branch_name }}
          title: ${{ env.pr_name }}
-          commit-message: ${{ env.pr_name }}
          token: ${{ steps.generate-token.outputs.token }}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,62 +0,0 @@
-name: build
-on:
-  push:
-    branches: [master]
-  pull_request: {}
-
-permissions:
-  contents: read
-
-jobs:
-  discover_build_logic_change:
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-slim
-    env:
-      FULL_OS_MATRIX: '[
-        "macos-14",
-        "macos-15",
-        "macos-15-intel",
-        "macos-26",
-        "macos-26-intel",
-        "ubuntu-22.04",
-        "ubuntu-22.04-arm",
-        "ubuntu-24.04",
-        "ubuntu-24.04-arm"
-      ]'
-    outputs:
-      os: ${{ steps.detect.outputs.os }}
-    steps:
-      - uses: actions/checkout@v7
-      - run: git fetch origin "$GITHUB_BASE_REF"
-      - id: detect
-        shell: bash
-        run: |
-          if [[ -n $(git diff --name-only "origin/$GITHUB_BASE_REF" -- \
-                       plugins/python-build/bin/python-build \
-                       .github/actions/build-python/action.yml \
-                       .github/workflows/build.yml) ]]
-          then
-            printf "%s\n" "os<<!" "$FULL_OS_MATRIX" "!" >> "$GITHUB_OUTPUT"
-          fi
-
-  build:
-    needs: discover_build_logic_change
-    # Run when the detection job succeeded *or was skipped* -- but not failed
-    if: ${{ !cancelled() && !failure() }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ${{ fromJson(needs.discover_build_logic_change.outputs.os || '["macos-latest","ubuntu-latest"]') }}
-        python-version:
-          - "3.10"
-          - "3.11"
-          - "3.12"
-          - "3.13"
-          - "3.14"
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v7
-      - uses: ./.github/actions/build-python
-        with:
-          python-version: ${{ matrix.python-version }}
-
--- a/.github/workflows/macos_build.yml
+++ b/.github/workflows/macos_build.yml
@ -0,0 +1,38 @@
+name: macos_build
+on: [pull_request, push]
+
+permissions:
+  contents: read  #  to fetch code (actions/checkout)
+
+jobs:
+  macos_build:
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
+          - "3.14"
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v6
+      - run: |
+          brew install openssl readline sqlite3 xz tcl-tk@8 libb2 zstd
+      # https://github.com/pyenv/pyenv#installation
+      - run: pwd
+      - env:
+          PYENV_ROOT: /Users/runner/work/pyenv/pyenv
+        run: |
+          echo $PYENV_ROOT
+          echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
+          bin/pyenv --debug install ${{ matrix.python-version }}
+          bin/pyenv global ${{ matrix.python-version }}
+          bin/pyenv rehash
+      - run: python --version
+      - run: python -m pip --version
+      - shell: python  # Prove that actual Python == expected Python
+        env:
+          EXPECTED_PYTHON: ${{ matrix.python-version }}
+        run: import os, sys ; assert sys.version.startswith(os.getenv("EXPECTED_PYTHON"))
--- a/.github/workflows/modified_scripts_build.yml
+++ b/.github/workflows/modified_scripts_build.yml
@ -2,23 +2,20 @@ name: modified_scripts
 on: [pull_request]
 jobs:
  discover_modified_scripts:
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
    outputs:
      versions: ${{steps.modified-versions.outputs.versions}}
      versions_cpython_only: ${{steps.modified-versions.outputs.versions_cpython_only}}
      versions_macos_build_exclude: ${{steps.modified-versions.outputs.versions_macos_build_exclude}}
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
      - run: git fetch origin "$GITHUB_BASE_REF"
      - shell: bash
        run: >
          versions=$(git diff "origin/$GITHUB_BASE_REF" --name-only -z
          | perl -ne 'BEGIN {$\="\n";$/="\0";} chomp;
-            if (/^(plugins\/python-build\/share\/python-build\/)(?:([^\/]+)|patches\/([^\/]+)\/.*)$/ and -e $& )
-                {
-                  print $2.$3;
-                  if ( -e $1.$2.$3.t ) { print $2.$3.t; }
-                }' \
+            if (/^plugins\/python-build\/share\/python-build\/(?:([^\/]+)|patches\/([^\/]+)\/.*)$/ and -e $& )
+                { print $1.$2; }' \
          | sort -u);
          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64);
          echo "versions<<$EOF" >> $GITHUB_ENV;
@ -43,32 +40,28 @@ 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'miniconda3-\d+\.\d+-(\d+\.\d+\.\d+)', line):
-              version = packaging.version.Version(m.group(1))
+            if m:=re.match(r'([^-]+)-(\d+\.\d+)-(\d+\.\d+.\d+)', line):
+              name, version = m.group(1), packaging.version.Version(m.group(3))
              
              # Miniconda dropped MacOS x64 support
-              if version >= packaging.version.Version('25.9.1'):
-                exclude_macos_intel(result, line)
+              if (name == 'miniconda3' and version >= packaging.version.Version('25.9.1')):
+                result.append({'os':'macos-15-intel','python-version':line})
            
-            if m:=re.match(r'anaconda3-(\d+\.\d+)', line):
-              version = packaging.version.Version(m.group(1))
+            if m:=re.match(r'([^-]+)-(\d+\.\d+)', line):
+              name, version = m.group(1), packaging.version.Version(m.group(2))
              
              # Anaconda dropped MacOS x64 support
-              if version >= packaging.version.Version('2025.12'):
-                exclude_macos_intel(result, line)
+              if name == 'anaconda3' and version >= packaging.version.Version('2025.12'):
+                result.append({'os':'macos-15-intel','python-version':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'):
-                exclude_macos_intel(result, line)
+                result.append({'os':'macos-15-intel','python-version':line})
              
          
          EOF = str(random.getrandbits(15*8))
@ -95,11 +88,10 @@ 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:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
      - run: |
          #envvars
          export PYENV_ROOT="$GITHUB_WORKSPACE"
@ -107,7 +99,7 @@ jobs:
          echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
      - run: |
          #prerequisites
-          brew install openssl readline sqlite3 xz tcl-tk@8 libb2 zstd
+          brew install openssl openssl@1.1 readline sqlite3 xz zlib
          if [[ "${{ matrix.python-version }}" =~ pypy.*-(src|dev) ]]; then
            export PYENV_BOOTSTRAP_VERSION=pypy2.7-7
            echo "PYENV_BOOTSTRAP_VERSION=$PYENV_BOOTSTRAP_VERSION" >> $GITHUB_ENV
@ -158,15 +150,10 @@ jobs:
      fail-fast: false
      matrix:
        python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions_cpython_only)}}
-        os:
-          - macos-14
-          - macos-15
-          - macos-15-intel
-          - macos-26
-          - macos-26-intel
+        os: ["macos-14", "macos-15", "macos-15-intel"]
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
      - run: |
          #envvars
          export PYENV_ROOT="$GITHUB_WORKSPACE"
@ -174,8 +161,13 @@ jobs:
          echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
      - run: |
          #prerequisites
-          brew install sqlite3 xz tcl-tk@8 libb2 zstd
-          "$GITHUB_WORKSPACE/.github/workflows/scripts/brew-uninstall-cascade.sh" $(brew list | grep -E '^openssl(@|$)') readline
+          brew install sqlite3 xz zlib
+          "$GITHUB_WORKSPACE/.github/workflows/scripts/brew-uninstall-cascade.sh" openssl@3 openssl@1.1 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=$?
@ -207,12 +199,10 @@ jobs:
        python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions)}}
        os:
          - ubuntu-22.04
-          - ubuntu-22.04-arm
          - ubuntu-24.04
-          - ubuntu-24.04-arm
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
      - run: |
          #envvars
          export PYENV_ROOT="$GITHUB_WORKSPACE"
@ -220,7 +210,10 @@ jobs:
          echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
      - run: |
          #prerequisites
-          pyenv install-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 \
+            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
@ -269,18 +262,27 @@ jobs:
      fail-fast: false
      matrix:
        python-version: ${{fromJson(needs.discover_modified_scripts.outputs.versions_cpython_only)}}
-    runs-on: ubuntu-latest
+        os: ["ubuntu-latest"]
+    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
      - run: |
          #envvars
          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_ENV
+          echo "_PYTHON_BUILD_FORCE_SKIP_XZ=1" >> $GITHUB_PATH
      - run: |
          #prerequisites
-          pyenv install-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 \
+            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=$?
--- a/.github/workflows/no-response.yml
+++ b/.github/workflows/no-response.yml
@ -6,8 +6,8 @@ on:
  issue_comment:
    types: [created]
  schedule:
-    # Schedule for ten minutes after the hour, every 2 hours
-    - cron: '10 */2 * * *'
+    # Schedule for ten minutes after the hour, every hour
+    - cron: '10 * * * *'

 permissions: {}
 jobs:
@ -15,7 +15,7 @@ jobs:
    permissions:
      issues: write  #  to update issues (lee-dohm/no-response)

-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
    steps:
      - uses: lee-dohm/no-response@v0.5.0
        with:
--- a/.github/workflows/pyenv_tests.yml
+++ b/.github/workflows/pyenv_tests.yml
@ -1,8 +1,5 @@
 name: pyenv_tests
-on:
-  push:
-    branches: [master]
-  pull_request: {}
+on: [pull_request, push]

 permissions:
  contents: read  #  to fetch code (actions/checkout)
@ -14,32 +11,33 @@ jobs:
      matrix:
        os:
          - ubuntu-22.04
-          - ubuntu-22.04-arm
          - ubuntu-24.04
-          - ubuntu-24.04-arm
          - macos-14
          - macos-15
          - macos-15-intel
          - macos-26
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v7
-      - name: Install prerequisites
-        run: |
+      - uses: actions/checkout@v6
+      - run: |
          if test "$RUNNER_OS" == "macOS"; then
            brew install coreutils fish
          fi
-      - name: Run tests
+      - run: pwd
+      - env:
+          PYENV_ROOT: /home/runner/work/pyenv/pyenv
+        run: |
+          echo $PYENV_ROOT
+          echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
+      - name: Run test on the host
        run: |
          make test
+      - name: Run test with docker
+        if: ${{ ! contains(matrix.os, 'macos') }}
+        run: |
+          make test-docker
      - env:
          PYENV_NATIVE_EXT: 1
        run: |
          (cd src; ./configure; make)
          bats/bin/bats test/{pyenv,hooks,versions}.bats
-  pyenv_tests_docker:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-      - run: |
-          make test-docker
--- a/.github/workflows/ubuntu_build.yml
+++ b/.github/workflows/ubuntu_build.yml
@ -0,0 +1,40 @@
+name: ubuntu_build
+on: [pull_request, push]
+
+permissions:
+  contents: read  #  to fetch code (actions/checkout)
+
+jobs:
+  ubuntu_build:
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
+          - "3.14"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - run: |
+          sudo apt-get update -q; sudo apt install -yq make build-essential libssl-dev zlib1g-dev \
+          libbz2-dev libreadline-dev libsqlite3-dev curl \
+          libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev
+      # https://github.com/pyenv/pyenv#installation
+      - run: pwd
+      - env:
+          PYENV_ROOT: /home/runner/work/pyenv/pyenv
+        run: |
+          echo $PYENV_ROOT
+          echo "$PYENV_ROOT/shims:$PYENV_ROOT/bin" >> $GITHUB_PATH
+          bin/pyenv --debug install ${{ matrix.python-version }}
+          bin/pyenv global ${{ matrix.python-version }}
+          bin/pyenv rehash
+      - run: python --version
+      - run: python -m pip --version
+      - shell: python  # Prove that actual Python == expected Python
+        env:
+          EXPECTED_PYTHON: ${{ matrix.python-version }}
+        run: import os, sys ; assert sys.version.startswith(os.getenv("EXPECTED_PYTHON"))
--- a/.gitignore
+++ b/.gitignore
@ -11,4 +11,3 @@
 /default-packages
 .idea
 *.un~
-*.swp
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,97 +1,5 @@
 # Version History

-## Release v2.8.5
-* pyenv-binary: record direct system dependencies in Linux/FreeBSD by @macayu17 in https://github.com/pyenv/pyenv/pull/3520
-* tests: Fix "cd: null directory" in OpenSUSE by @native-api in https://github.com/pyenv/pyenv/pull/3524
-* Test improvements by @native-api in https://github.com/pyenv/pyenv/pull/3525
-* CI: test on all runners when the build logic changes by @sujeito-operator in https://github.com/pyenv/pyenv/pull/3522
-* Add GraalPy 25.3.4.1 by @msimacek in https://github.com/pyenv/pyenv/pull/3529
-* Add CPython 3.15.0rc2 by @pyenv-bot[bot] in https://github.com/pyenv/pyenv/pull/3530
-* pyenv-binary: support relocating macOS archives by @macayu17 in https://github.com/pyenv/pyenv/pull/3528
-
-## Release v2.8.4
-* CI: Add macos_26_intel by @native-api in https://github.com/pyenv/pyenv/pull/3514
-* pyenv-binary: check FreeBSD system libraries by @macayu17 in https://github.com/pyenv/pyenv/pull/3511
-* version-file: Fix infinite loop for a relative path argument by @fudianchn in https://github.com/pyenv/pyenv/pull/3515
-* pyenv-binary: check patchelf early and add --verbose by @macayu17 in https://github.com/pyenv/pyenv/pull/3516
-* CI: add ubuntu ARM images by @native-api in https://github.com/pyenv/pyenv/pull/3517
-* Add CPython 3.10.21, 3.11.16, 3.12.14 by @pyenv-bot[bot] in https://github.com/pyenv/pyenv/pull/3518
-* Add anaconda3-2026.07-1, miniconda3 26.5.3-2 by @native-api in https://github.com/pyenv/pyenv/pull/3519
-
-## 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
-* Bump actions/setup-python from 6 to 7 in the github-actions group by @dependabot[bot] in https://github.com/pyenv/pyenv/pull/3505
-* add_cpython: refactor extra Requests logic by @anupamme in https://github.com/pyenv/pyenv/pull/3507
-* Add CPython 3.15.0rc1 by @jsirois in https://github.com/pyenv/pyenv/pull/3510
-* pyenv-binary: generate platform-specific package names by @macayu17 in https://github.com/pyenv/pyenv/pull/3504
-
-## Release v2.8.1
-* pyenv-binary: add the `generate-installer` subcommand by @macayu17 in https://github.com/pyenv/pyenv/pull/3488
-* Add CPython 3.15.0b4 by @pyenv-bot[bot] in https://github.com/pyenv/pyenv/pull/3495
-
-## Release v2.8.0
-* CVE-2026-68939: Fix handling of glob characters in .python-version
-* CI: add_version enhancements by @native-api in https://github.com/pyenv/pyenv/pull/3480
-* Add miniforge3-26.3.2-2, 26.3.2-3 by @native-api in https://github.com/pyenv/pyenv/pull/3481
-* rehash: fix race condition in landlock writability check by @Sheile in https://github.com/pyenv/pyenv/pull/3483
-* Add script to generate sponsors section for release notes by @macayu17 in https://github.com/pyenv/pyenv/pull/3478
-* install: Add an ability to install a version under an alias by @macayu17 in https://github.com/pyenv/pyenv/pull/3484
-* Add graalpy-3.12-25.1.3 by @msimacek in https://github.com/pyenv/pyenv/pull/3485
-* Bump actions/checkout from 6 to 7 in the github-actions group by @dependabot[bot] in https://github.com/pyenv/pyenv/pull/3486
-* Add an experimental pyenv-binary plugin with a save command by @macayu17 in https://github.com/pyenv/pyenv/pull/3487
-* CI: dependabot: set cooldown by @orbisai0security in https://github.com/pyenv/pyenv/pull/3489
-* Fix typos in docs, scripts, and tests by @maxtaran2010 in https://github.com/pyenv/pyenv/pull/3490
-* Add miniconda3 26.5.3-1 by @native-api in https://github.com/pyenv/pyenv/pull/3491
-* version-name: skip redundant checks by @native-api in https://github.com/pyenv/pyenv/pull/3492
-
-## Release v2.7.3
-* CI: add_version enhancements by @macayu17 in https://github.com/pyenv/pyenv/pull/3475
-* Add CPython 3.15.0b3 by @pyenv-bot[bot] in https://github.com/pyenv/pyenv/pull/3479
-
-## Release v2.7.2
-* fix(rehash): prevent terminal hang caused by stale or sandbox-blocked lock file by @anupddas in https://github.com/pyenv/pyenv/pull/3469
-* 3.6.x: Fix verify_* calls by @native-api in https://github.com/pyenv/pyenv/commit/6c0c5cfa9619e4a7a90102d8bee6c771c4739836
-* Add CPython 3.14.6 by @pyenv-bot[bot] in https://github.com/pyenv/pyenv/pull/3472
-* Add CPython 3.13.14 by @pyenv-bot[bot] in https://github.com/pyenv/pyenv/pull/3473
-
-## Release v2.7.1
-* Support 3.9 EOL Pip URL, consolidate tests by @native-api in https://github.com/pyenv/pyenv/pull/3465
-* Update URLs for PyPy nightly; Remove pypy3.5 and pypy3.7 nightly by @native-api in https://github.com/pyenv/pyenv/pull/3466
-* Add CPython 3.15.0b2 by @pyenv-bot[bot] in https://github.com/pyenv/pyenv/pull/3467
-* init: add --install for shell setup by @macayu17 in https://github.com/pyenv/pyenv/pull/3454
-* realpath.c: fix obsolete syntax warning by @native-api in https://github.com/pyenv/pyenv/pull/3468
-
-## Release v2.6.32
-* Add miniconda3 26.3.2-2, miniforge3 26.3.2-0, 26.3.2-1 by @native-api in https://github.com/pyenv/pyenv/pull/3445
-* miniforge3 26.1, 26.3, add_miniforge: exclude .pkg installers by @native-api in https://github.com/pyenv/pyenv/pull/3446
-* miniforge 26, CI: switch check to 3.13 by @native-api in https://github.com/pyenv/pyenv/pull/3447
-* 2.7, 3.4: force C99 standard; 2.7.14-18: force OpenSSL 1 formula by @native-api in https://github.com/pyenv/pyenv/pull/3448
-* rehash: detect and remove a stale lockfile by @native-api in https://github.com/pyenv/pyenv/pull/3450
-* Add GraalPy 25.0.3 by @msimacek in https://github.com/pyenv/pyenv/pull/3452
-* 3.11.0+: Use the `--with-openssl-rpath' Configure option when possible by @native-api in https://github.com/pyenv/pyenv/pull/3458
-* python_build: Make `verify_python` verify `pythonX.Y' suffix by @native-api in https://github.com/pyenv/pyenv/pull/3459
-* Add micropython 1.22.0 to 1.28.0; add downstream patches to fix compilation errors by @native-api in https://github.com/pyenv/pyenv/pull/3460
-* Fix linking against a keg_only Homebrew OpenSSL when a a non-keg_only one is also installed by @native-api in https://github.com/pyenv/pyenv/pull/3462
-* Add missing CPython 3.14.2t by @native-api in https://github.com/pyenv/pyenv/pull/3464
-* 3.14.0-5: Support building against OpenSSL 4 by @native-api in https://github.com/pyenv/pyenv/pull/3463
-
-## Release v2.6.31
-* CI: add_cpython: Support prereleases for non-initial CPython releases by @native-api in https://github.com/pyenv/pyenv/pull/3443
-* Add CPython 3.14.5 by @pyenv-bot[bot] in https://github.com/pyenv/pyenv/pull/3444
-
-## Release v2.6.30
-* Add CPython 3.16-dev, switch 3.15-dev to maintenance branch by @nedbat in https://github.com/pyenv/pyenv/pull/3442
-
-## Release v2.6.29
-* Add PyPy v7.3.22 by @jsirois in https://github.com/pyenv/pyenv/pull/3438
-* CI: Add timeouts to CPython release metadata fetches by @orbisai0security in https://github.com/pyenv/pyenv/pull/3439
-* Add CPython 3.15.0b1 by @jsirois in https://github.com/pyenv/pyenv/pull/3440
-* Add CPython 3.14.5rc1 by @native-api in https://github.com/pyenv/pyenv/pull/3441
-
 ## Release v2.6.28
 * pyenv-latest: fast path for when there is an exact match by @native-api in https://github.com/pyenv/pyenv/pull/3437

@ -417,7 +325,7 @@
 * Add CPython 3.13.0a4 by @saaketp in https://github.com/pyenv/pyenv/pull/2903
 * Handle the case where `pyenv-commands --sh` returns nothing by @aphedges in https://github.com/pyenv/pyenv/pull/2908
 * Document default build configuration customizations by @native-api in https://github.com/pyenv/pyenv/pull/2911
-* Use Homebrew in Linux if Pyenv is installed with Homebrew by @native-api in https://github.com/pyenv/pyenv/pull/2906
+* Use Homebrew in Linux if Pyenv is installled with Homebrew by @native-api in https://github.com/pyenv/pyenv/pull/2906
 * Add miniforge and mambaforge 22.11.1-3, 22.11.1-4, 23.1.0-0 to 23.11.0-0 by @aphedges in https://github.com/pyenv/pyenv/pull/2909
 * Add miniconda3-24.1.2 by @binbjz in https://github.com/pyenv/pyenv/pull/2915
 * Minor grammar fix in libffi backport patch in 2.5.x by @cuinix in https://github.com/pyenv/pyenv/pull/2922
@ -1553,7 +1461,7 @@
 * pyenv: Prefer gawk over awk if both are available.
 * python-build: Add new PyPy release; pypy-2.3, pypy-2.3-src (#162)
 * python-build: Add new Anaconda release; anaconda-1.9.2 (#155)
-* python-build: Add new Miniconda releases; miniconda-3.3.0, miniconda-3.4.2, miniconda3-3.3.0, miniconda3-3.4.2
+* python-build: Add new Miniconda releases; miniconda-3.3.0, minoconda-3.4.2, miniconda3-3.3.0, miniconda3-3.4.2
 * python-build: Add new Stackless releases; stackless-2.7.3, stackless-2.7.4, stackless-2.7.5, stackless-2.7.6, stackless-3.2.5, stackless-3.3.5 (#164)
 * python-build: Add IronPython versions (setuptools and pip will work); ironpython-2.7.4, ironpython-dev
 * python-build: Add new Jython beta release; jython-2.7-beta2
--- a/COMMANDS.md
+++ b/COMMANDS.md
@ -202,8 +202,8 @@ or, if you prefer 3.3.3 over 2.7.6,

 Install a Python version (using [`python-build`](https://github.com/pyenv/pyenv/tree/master/plugins/python-build)).

-    Usage: pyenv install [-f] [-kvp] <version>[:<alias>]
-           pyenv install [-f] [-kvp] <definition-file>[:<alias>]
+    Usage: pyenv install [-f] [-kvp] <version>
+           pyenv install [-f] [-kvp] <definition-file>
           pyenv install -l|--list

      -l/--list             List all available versions
@ -393,15 +393,11 @@ List existing pyenv shims.
 Configure the shell environment for pyenv

    Usage: eval "$(pyenv init [-|--path] [--no-push-path] [--no-rehash] [<shell>])"
-           pyenv init --install [<shell>]
-           pyenv init --detect-shell [<shell>]

      -                    Initialize shims directory, print PYENV_SHELL variable, completions path
                           and shell function
      --path               Print shims path
-      --install            Configure detected shell startup files
      --no-push-path       Do not push shim to the start of PATH if they're already there
-      --detect-shell       Print shell startup files detected for the current shell
      --no-rehash          Add no rehash command to output     

 ## `pyenv completions`
--- a/MAINTENANCE.md
+++ b/MAINTENANCE.md
@ -7,14 +7,6 @@ Release checklist:
 * Start [drafting a new release on GitHub](https://github.com/pyenv/pyenv/releases) to generate a summary of changes.  
 Type the would-be tag name in the "Choose a tag" field and press "Generate release notes"
  * The summary may need editing. E.g. rephrase entries, delete/merge entries that are too minor or irrelevant to the users (e.g. typo fixes, CI)
-* Add a sponsors section to the release notes by running:
-  ```bash
-  .github/scripts/generate_release_notes_sponsors.py
-  ```
-  Paste the output at the end of the release notes.
-  * This lists new GitHub Sponsors and OpenCollective backers since the last release or within the last month, whichever is longer.
-  * The GitHub Sponsors query requires the `gh` CLI with the `read:user` scope.
-  * If OpenCollective is unavailable, pass `--skip-opencollective` and add those backers manually.
 * Update `CHANGELOG.md` with the new version number and the edited summary (only the changes section)
 * Push the version number in `libexec/pyenv---version` and `plugins/python-build/bin/python-build`
  * Minor version is pushed if there are significant functional changes (not e.g. bugfixes/formula adaptations/supporting niche use cases).
@ -22,4 +14,4 @@ Type the would-be tag name in the "Choose a tag" field and press "Generate relea
 * Commit the changes locally into `master`
 * Create a new tag locally with the same name as specified in the new release window
 * Push the changes including the tag
-* In the still open new release window, press "Publish release". The now-existing tag will be used.
+* In the still open new release window, press "Publish release". The now-existing tag will be used.
--- a/131
+++ b/131
@ -1,24 +1,16 @@
 TEST_BATS_VERSION = v1.10.0
 TEST_BASH_VERSIONS = 3.2.57 4.1.17
-
 TEST_UNIT_DOCKER_PREFIX = test-unit-docker
 TEST_UNIT_DOCKER_TARGETS = $(foreach bash,$(TEST_BASH_VERSIONS),$(addsuffix -$(bash),$(TEST_UNIT_DOCKER_PREFIX)) $(addsuffix -gnu-$(bash),$(TEST_UNIT_DOCKER_PREFIX)))
-
-TEST_PYTHON_BUILD_DOCKER_PREFIX = test-python-build-docker
-TEST_PYTHON_BUILD_DOCKER_TARGETS = $(foreach bash,$(TEST_BASH_VERSIONS),$(addsuffix -$(bash),$(TEST_PYTHON_BUILD_DOCKER_PREFIX)) $(addsuffix -gnu-$(bash),$(TEST_PYTHON_BUILD_DOCKER_PREFIX)))
-
-TEST_BINARY_DOCKER_PREFIX = test-binary-docker
-TEST_BINARY_DOCKER_TARGETS = $(foreach bash,$(TEST_BASH_VERSIONS),$(addsuffix -$(bash),$(TEST_BINARY_DOCKER_PREFIX)) $(addsuffix -gnu-$(bash),$(TEST_BINARY_DOCKER_PREFIX)))
-
-TEST_LINK_DOCKER_PREFIX = test-link-docker
-TEST_LINK_DOCKER_TARGETS = $(foreach bash,$(TEST_BASH_VERSIONS),$(addsuffix -$(bash),$(TEST_LINK_DOCKER_PREFIX)) $(addsuffix -gnu-$(bash),$(TEST_LINK_DOCKER_PREFIX)))
-
+TEST_PLUGIN_DOCKER_PREFIX = test-plugin-docker
+TEST_PLUGIN_DOCKER_TARGETS = $(foreach bash,$(TEST_BASH_VERSIONS),$(addsuffix -$(bash),$(TEST_PLUGIN_DOCKER_PREFIX)) $(addsuffix -gnu-$(bash),$(TEST_PLUGIN_DOCKER_PREFIX)))
 TEST_BATS_IMAGE_PREFIX = test-pyenv-docker-image
 TEST_BATS_IMAGE_TARGETS = $(foreach bash,$(TEST_BASH_VERSIONS),$(addsuffix -$(bash),$(TEST_BATS_IMAGE_PREFIX)) $(addsuffix -gnu-$(bash),$(TEST_BATS_IMAGE_PREFIX)))

-.PHONY: test-docker
-test-docker: $(TEST_UNIT_DOCKER_PREFIX) $(TEST_PYTHON_BUILD_DOCKER_PREFIX) $(TEST_BINARY_DOCKER_PREFIX) $(TEST_LINK_DOCKER_PREFIX)
+.PHONY:
+test-docker: $(TEST_UNIT_DOCKER_PREFIX) $(TEST_PLUGIN_DOCKER_PREFIX)

+# Run all unit test under bats docker
 .PHONY: $(TEST_UNIT_DOCKER_PREFIX)
 $(TEST_UNIT_DOCKER_PREFIX): $(TEST_UNIT_DOCKER_TARGETS)

@ -39,22 +31,23 @@ $(TEST_UNIT_DOCKER_TARGETS): $(TEST_UNIT_DOCKER_PREFIX)-% : $(TEST_BATS_IMAGE_PR
 		-u "$$(id -u $$(whoami)):$$(id -g $$(whoami))" \
 		$${BATS_TEST_FILTER:+-e BATS_TEST_FILTER="$${BATS_TEST_FILTER}"} \
 		$${BATS_FILE_FILTER:+-e BATS_FILE_FILTER="$${BATS_FILE_FILTER}"} \
-		$${CI+-e CI="$${CI}"} \
-		$(INTERACTIVE) \
+	        $${CI+-e CI="$${CI}"} \
+	        $(INTERACTIVE) \
 		$(DOCKER_IMAGE):$(DOCKER_TAG) \
 		test/run

-.PHONY: $(TEST_PYTHON_BUILD_DOCKER_PREFIX)
-$(TEST_PYTHON_BUILD_DOCKER_PREFIX): $(TEST_PYTHON_BUILD_DOCKER_TARGETS)
+# Run all plugin test under bats docker
+.PHONY: $(TEST_PLUGIN_DOCKER_PREFIX)
+$(TEST_PLUGIN_DOCKER_PREFIX): $(TEST_PLUGIN_DOCKER_TARGETS)

 # Run each plugin test under bats docker
-.PHONY: $(TEST_PYTHON_BUILD_DOCKER_TARGETS)
-$(TEST_PYTHON_BUILD_DOCKER_TARGETS): DOCKER_IMAGE = $(TEST_BATS_IMAGE_PREFIX)
-$(TEST_PYTHON_BUILD_DOCKER_TARGETS): GNU = $(if $(findstring -gnu-,$@),True,False)
-$(TEST_PYTHON_BUILD_DOCKER_TARGETS): BASH = $(filter $(TEST_BASH_VERSIONS),$(subst -, ,$@))
-$(TEST_PYTHON_BUILD_DOCKER_TARGETS): DOCKER_TAG = bash-$(BASH)-gnu-$(GNU)
-$(TEST_PYTHON_BUILD_DOCKER_TARGETS): INTERACTIVE = $(if $(findstring true,$(CI)),,-ti)
-$(TEST_PYTHON_BUILD_DOCKER_TARGETS): $(TEST_PYTHON_BUILD_DOCKER_PREFIX)-% : $(TEST_BATS_IMAGE_PREFIX)-%
+.PHONY: $(TEST_PLUGIN_DOCKER_TARGETS)
+$(TEST_PLUGIN_DOCKER_TARGETS): DOCKER_IMAGE = $(TEST_BATS_IMAGE_PREFIX)
+$(TEST_PLUGIN_DOCKER_TARGETS): GNU = $(if $(findstring -gnu-,$@),True,False)
+$(TEST_PLUGIN_DOCKER_TARGETS): BASH = $(filter $(TEST_BASH_VERSIONS),$(subst -, ,$@))
+$(TEST_PLUGIN_DOCKER_TARGETS): DOCKER_TAG = bash-$(BASH)-gnu-$(GNU)
+$(TEST_PLUGIN_DOCKER_TARGETS): INTERACTIVE = $(if $(findstring true,$(CI)),,-ti)
+$(TEST_PLUGIN_DOCKER_TARGETS): $(TEST_PLUGIN_DOCKER_PREFIX)-% : $(TEST_BATS_IMAGE_PREFIX)-%
 	$(info Running test with docker image '$(DOCKER_IMAGE):$(DOCKER_TAG)')
 	docker run \
 		--init \
@ -62,57 +55,10 @@ $(TEST_PYTHON_BUILD_DOCKER_TARGETS): $(TEST_PYTHON_BUILD_DOCKER_PREFIX)-% : $(TE
 		-v /etc/passwd:/etc/passwd:ro \
 		-v /etc/group:/etc/group:ro \
 		-u "$$(id -u $$(whoami)):$$(id -g $$(whoami))" \
-		$${CI+-e CI="$${CI}"} \
-		$(INTERACTIVE) \
+	        $${CI+-e CI="$${CI}"} \
+	        $(INTERACTIVE) \
 		$(DOCKER_IMAGE):$(DOCKER_TAG) \
-		bats $${CI:+-F "/code/test/libexec/bats-format-tap-suite"} \
-		$${BATS_TEST_FILTER:+--filter "$${BATS_TEST_FILTER}"} plugins/python-build/test/$${BATS_FILE_FILTER}
-
-.PHONY: $(TEST_BINARY_DOCKER_PREFIX)
-$(TEST_BINARY_DOCKER_PREFIX): $(TEST_BINARY_DOCKER_TARGETS)
-
-.PHONY: $(TEST_BINARY_DOCKER_TARGETS)
-$(TEST_BINARY_DOCKER_TARGETS): DOCKER_IMAGE = $(TEST_BATS_IMAGE_PREFIX)
-$(TEST_BINARY_DOCKER_TARGETS): GNU = $(if $(findstring -gnu-,$@),True,False)
-$(TEST_BINARY_DOCKER_TARGETS): BASH = $(filter $(TEST_BASH_VERSIONS),$(subst -, ,$@))
-$(TEST_BINARY_DOCKER_TARGETS): DOCKER_TAG = bash-$(BASH)-gnu-$(GNU)
-$(TEST_BINARY_DOCKER_TARGETS): INTERACTIVE = $(if $(findstring true,$(CI)),,-ti)
-$(TEST_BINARY_DOCKER_TARGETS): $(TEST_BINARY_DOCKER_PREFIX)-% : $(TEST_BATS_IMAGE_PREFIX)-%
-	$(info Running test with docker image '$(DOCKER_IMAGE):$(DOCKER_TAG)')
-	docker run \
-		--init \
-		-v $(PWD):/code:ro \
-		-v /etc/passwd:/etc/passwd:ro \
-		-v /etc/group:/etc/group:ro \
-		-u "$$(id -u $$(whoami)):$$(id -g $$(whoami))" \
-		$${CI+-e CI="$${CI}"} \
-		$(INTERACTIVE) \
-		$(DOCKER_IMAGE):$(DOCKER_TAG) \
-		bats $${CI:+-F "/code/test/libexec/bats-format-tap-suite"} \
-		$${BATS_TEST_FILTER:+--filter "$${BATS_TEST_FILTER}"} plugins/pyenv-binary/test/$${BATS_FILE_FILTER}
-
-.PHONY: $(TEST_LINK_DOCKER_PREFIX)
-$(TEST_LINK_DOCKER_PREFIX): $(TEST_LINK_DOCKER_TARGETS)
-
-.PHONY: $(TEST_LINK_DOCKER_TARGETS)
-$(TEST_LINK_DOCKER_TARGETS): DOCKER_IMAGE = $(TEST_BATS_IMAGE_PREFIX)
-$(TEST_LINK_DOCKER_TARGETS): GNU = $(if $(findstring -gnu-,$@),True,False)
-$(TEST_LINK_DOCKER_TARGETS): BASH = $(filter $(TEST_BASH_VERSIONS),$(subst -, ,$@))
-$(TEST_LINK_DOCKER_TARGETS): DOCKER_TAG = bash-$(BASH)-gnu-$(GNU)
-$(TEST_LINK_DOCKER_TARGETS): INTERACTIVE = $(if $(findstring true,$(CI)),,-ti)
-$(TEST_LINK_DOCKER_TARGETS): $(TEST_LINK_DOCKER_PREFIX)-% : $(TEST_BATS_IMAGE_PREFIX)-%
-	$(info Running test with docker image '$(DOCKER_IMAGE):$(DOCKER_TAG)')
-	docker run \
-		--init \
-		-v $(PWD):/code:ro \
-		-v /etc/passwd:/etc/passwd:ro \
-		-v /etc/group:/etc/group:ro \
-		-u "$$(id -u $$(whoami)):$$(id -g $$(whoami))" \
-		$${CI+-e CI="$${CI}"} \
-		$(INTERACTIVE) \
-		$(DOCKER_IMAGE):$(DOCKER_TAG) \
-		bats $${CI:+-F "/code/test/libexec/bats-format-tap-suite"} \
-		$${BATS_TEST_FILTER:+--filter "$${BATS_TEST_FILTER}"} plugins/pyenv-link/test/$${BATS_FILE_FILTER}
+		bats $${BATS_TEST_FILTER:+--filter "$${BATS_TEST_FILTER}"} plugins/python-build/test/$${BATS_FILE_FILTER}

 # Build all images needed for bats under docker
 .PHONY: $(TEST_BATS_IMAGE_PREFIX)
@ -125,7 +71,7 @@ $(TEST_BATS_IMAGE_TARGETS): GNU = $(if $(findstring -gnu-,$@),True,False)
 $(TEST_BATS_IMAGE_TARGETS): BASH = $(filter $(TEST_BASH_VERSIONS),$(subst -, ,$@))
 $(TEST_BATS_IMAGE_TARGETS): DOCKER_TAG = bash-$(BASH)-gnu-$(GNU)
 $(TEST_BATS_IMAGE_TARGETS):
-	if [ -z "$$(docker images -q '$(DOCKER_IMAGE):$(DOCKER_TAG)')" ]]; then \
+	$(info Building docker image '$(DOCKER_IMAGE):$(DOCKER_TAG)')
 	docker build \
 		--quiet \
 		-f "$(PWD)/test/Dockerfile" \
@ -133,38 +79,41 @@ $(TEST_BATS_IMAGE_TARGETS):
 		--build-arg BASH="$(BASH)" \
 		--build-arg BATS_VERSION="$(TEST_BATS_VERSION)" \
 		-t $(DOCKER_IMAGE):$(DOCKER_TAG) \
-		./ ; \
-	fi
+		./

-.PHONY: test test-unit test-python-build test-binary test-link
+.PHONY: test test-build test-unit test-plugin

 # Do not pass in user flags to build tests.
 unexport PYTHON_CFLAGS
 unexport PYTHON_CONFIGURE_OPTS

-test: test-unit test-python-build test-binary test-link
+test: test-unit test-plugin

 test-unit: bats
 	PATH="./bats/bin:$$PATH" test/run
 	
-test-python-build: bats
-	cd plugins/python-build && $(PWD)/bats/bin/bats $${CI:+-F "$(PWD)/test/libexec/bats-format-tap-suite"} \
-		$${BATS_TEST_FILTER:+--filter "$${BATS_TEST_FILTER}"} test/$${BATS_FILE_FILTER}
+test-plugin: bats
+	cd plugins/python-build && $(PWD)/bats/bin/bats $${CI:+--tap} $${BATS_TEST_FILTER:+--filter "$${BATS_TEST_FILTER}"} test/$${BATS_FILE_FILTER}

-test-binary: bats
-	cd plugins/pyenv-binary && $(PWD)/bats/bin/bats $${CI:+-F "$(PWD)/test/libexec/bats-format-tap-suite"} \
-		$${BATS_TEST_FILTER:+--filter "$${BATS_TEST_FILTER}"} test/$${BATS_FILE_FILTER}
+PYTHON_BUILD_ROOT := $(CURDIR)/plugins/python-build
+PYTHON_BUILD_OPTS ?= --verbose
+PYTHON_BUILD_VERSION ?= 3.8-dev
+PYTHON_BUILD_TEST_PREFIX ?= $(PYTHON_BUILD_ROOT)/test/build/tmp/dist

-test-link: bats
-	cd plugins/pyenv-link && $(PWD)/bats/bin/bats $${CI:+-F "$(PWD)/test/libexec/bats-format-tap-suite"} \
-		$${BATS_TEST_FILTER:+--filter "$${BATS_TEST_FILTER}"} test/$${BATS_FILE_FILTER}
+test-build:
+	$(RM) -r $(PYTHON_BUILD_TEST_PREFIX)
+	$(PYTHON_BUILD_ROOT)/bin/python-build $(PYTHON_BUILD_OPTS) $(PYTHON_BUILD_VERSION) $(PYTHON_BUILD_TEST_PREFIX)
+	[ -e $(PYTHON_BUILD_TEST_PREFIX)/bin/python ]
+	$(PYTHON_BUILD_TEST_PREFIX)/bin/python -V
+	[ -e $(PYTHON_BUILD_TEST_PREFIX)/bin/pip ]
+	$(PYTHON_BUILD_TEST_PREFIX)/bin/pip -V

 .SECONDARY: bats-$(TEST_BATS_VERSION)
 bats-$(TEST_BATS_VERSION):
+	rm -rf bats
+	ln -sf bats-$(TEST_BATS_VERSION) bats
 	git clone --depth 1 --branch $(TEST_BATS_VERSION) https://github.com/bats-core/bats-core.git bats-$(TEST_BATS_VERSION)

 .PHONY: bats
 bats: bats-$(TEST_BATS_VERSION)
-	if [ \( ! -L bats \) -o \( "x$$(readlink bats)" != "xbats-$(TEST_BATS_VERSION)" \) ]; then \
-		rm -rf bats; ln -s bats-$(TEST_BATS_VERSION) bats; \
-	fi
+	ln -sf bats-$(TEST_BATS_VERSION) bats
--- a/README.md
+++ b/README.md
@ -13,8 +13,6 @@ This project was forked from [rbenv](https://github.com/rbenv/rbenv) and

 * Lets you **change the global Python version** on a per-user basis.
 * Provides support for **per-project Python versions**.
-* Supports **multiple Python distributions**: CPython, PyPy, Stackless Python, Jython, and more.
-  See the [full list of available versions](https://github.com/pyenv/pyenv/tree/master/plugins/python-build/share/python-build).
 * Allows you to **override the Python version** with an environment
  variable.
 * Searches for commands from **multiple versions of Python at a time**.
@ -71,7 +69,6 @@ This project was forked from [rbenv](https://github.com/rbenv/rbenv) and
  * [Using Pyenv without shims](#using-pyenv-without-shims)
  * [Running nested shells from Python-based programs](#running-nested-shells-from-python-based-programs)
  * [Environment variables](#environment-variables)
-  * [Manual shell setup](#manual-shell-setup)
 * **[Development](#development)**
  * [Contributing](#contributing)
  * [Version History](#version-history)
@ -180,28 +177,115 @@ which does install native Windows Python versions.
 ----

 The below setup should work for the vast majority of users for common use cases.
-See [Advanced configuration](#advanced-configuration)
-and specifically [Manual shell setup](#manual-shell-setup) for details and more configuration options.
+See [Advanced configuration](#advanced-configuration) for details and more configuration options.

-To add the suggested setup code to the startup files of the running shell,
-run `<path/to/pyenv> --install`.
-Specifically:
+#### Bash
+  <details>

-* If you installed Pyenv with the installer script:
+  Stock Bash startup files vary widely between distributions in which of them source
+  which, under what circumstances, in what order and what additional configuration they perform.
+  As such, the most reliable way to get Pyenv in all environments is to append Pyenv
+  configuration commands to both `.bashrc` (for interactive shells)
+  and the profile file that Bash would use (for login shells).

-```sh
-~/.pyenv/bin/pyenv init --install
-```
+  1. First, add the commands to `~/.bashrc` by running the following in your terminal:

-* If you installed Pyenv with Homebrew:
+      ```bash
+      echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc
+      echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc
+      echo 'eval "$(pyenv init - bash)"' >> ~/.bashrc
+      ```
+  2. Then, if you have `~/.profile`, `~/.bash_profile` or `~/.bash_login`, add the commands there as well.
+     If you have none of these, create a `~/.profile` and add the commands there.

-```sh
-pyenv init --install
-```
+     * to add to `~/.profile`:
+       ``` bash
+       echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.profile
+       echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.profile
+       echo 'eval "$(pyenv init - bash)"' >> ~/.profile
+       ```
+     * to add to `~/.bash_profile`:
+       ```bash
+       echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile
+       echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bash_profile
+       echo 'eval "$(pyenv init - bash)"' >> ~/.bash_profile
+       ```

-For Bash, avoid the automatic `--install` path if your `BASH_ENV` points to
-`.bashrc`; use the manual Bash instructions below so the `eval "$(pyenv init - bash)"`
-line only goes in your login startup file.
+   **Bash warning**: There are some systems where the `BASH_ENV` variable is configured
+   to point to `.bashrc`. On such systems, you should almost certainly put the
+   `eval "$(pyenv init - bash)"` line into `.bash_profile`, and **not** into `.bashrc`. Otherwise, you
+   may observe strange behaviour, such as `pyenv` getting into an infinite loop.
+   See [#264](https://github.com/pyenv/pyenv/issues/264) for details.
+   
+   </details>
+   
+#### Zsh
+  
+  <details>
+  Add Pyenv startup commands to `~/.zshrc` by running the following in your terminal:
+  
+  ```zsh
+  echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.zshrc
+  echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.zshrc
+  echo 'eval "$(pyenv init - zsh)"' >> ~/.zshrc
+  ```
+  
+  If you wish to get Pyenv in noninteractive login shells as well, also add the commands to `~/.zprofile` or `~/.zlogin`.
+  </details>
+
+#### Fish
+
+  <details>
+
+  1. If you have Fish 3.2.0 or newer, execute this interactively:
+     ```fish
+     set -Ux PYENV_ROOT $HOME/.pyenv
+     test -d $PYENV_ROOT/bin; and fish_add_path $PYENV_ROOT/bin
+     ```
+
+  2. Otherwise, execute the snippet below:
+     ```fish
+     set -Ux PYENV_ROOT $HOME/.pyenv
+     test -d $PYENV_ROOT/bin; and set -U fish_user_paths $PYENV_ROOT/bin $fish_user_paths
+     ```
+
+  3. Now, add this to `~/.config/fish/config.fish`:
+     ```fish
+     pyenv init - fish | source
+     ```
+  </details>
+
+#### Nushell
+
+  <details>
+
+  Add the following lines to your `config.nu` to add Pyenv and its shims to your `PATH`.
+  Shell integration (completions and subcommands changing the shell's state)
+  isn't currently supported.
+
+  ~~~ nu
+  $env.PYENV_ROOT = "~/.pyenv" | path expand
+  if (( $"($env.PYENV_ROOT)/bin" | path type ) == "dir") {
+    $env.PATH = $env.PATH | prepend $"($env.PYENV_ROOT)/bin" }
+  $env.PATH = $env.PATH | prepend $"(pyenv root)/shims"
+  ~~~
+
+  </details>
+
+#### Microsoft PowerShell
+
+  <details>
+
+  Add the commands to `$profile.CurrentUserAllHosts` by running the following in your terminal:
+
+  ~~~ pwsh
+  echo '$Env:PYENV_ROOT="$Env:HOME/.pyenv"' >> $profile.CurrentUserAllHosts
+  echo 'if (Test-Path -LP "$Env:PYENV_ROOT/bin" -PathType Container) { 
+    $Env:PATH="$Env:PYENV_ROOT/bin:$Env:PATH" }' >> $profile.CurrentUserAllHosts
+  echo 'iex ((pyenv init -) -join "`n")' >> $profile.CurrentUserAllHosts
+  ~~~
+
+  </details>

 ### C. Restart your shell
 ----
@ -674,7 +758,7 @@ to `PATH` in the `<command>`'s environment, the same as what e.g. RVM does.
 ### Running nested shells from Python-based programs

 In addition to altering `PATH`, `pyenv exec` sets `PYENV_VERSION` in the
-executed program's environment to ensure that it won't spontaneously switch to
+executed program's environment to ensure that it won't spontaneouly switch to
 using a different Python version.

 Some Python-based programs (e.g. Jupyter) can spawn nested shell sessions.
@ -713,136 +797,18 @@ name | default | description
 See also [_Special environment variables_ in Python-Build's README](plugins/python-build/README.md#special-environment-variables)
 for environment variables that can be used to customize the build.

-
-### Manual shell setup
-
-Below is the suggested shell setup added to shell startup files by `pyenv init --install`.
-
-* To automatically install Pyenv for a shell different than the running shell, run
-
-```sh
-path/to/pyenv --install <shell executable name>
-```
-
-e.g. `~/.pyenv --install bash`.
-
-#### Bash
-  <details>
-
-  Stock Bash startup files vary widely between distributions in which of them source
-  which, under what circumstances, in what order and what additional configuration they perform.
-  As such, the most reliable way to get Pyenv in all environments is to append Pyenv
-  configuration commands to both `.bashrc` (for interactive shells)
-  and the profile file that Bash would use (for login shells).
-
-  1. First, add the commands to `~/.bashrc` by running the following in your terminal:
-
-      ```bash
-      echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc
-      echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc
-      echo 'eval "$(pyenv init - bash)"' >> ~/.bashrc
-      ```
-  2. Then, if you have `~/.profile`, `~/.bash_profile` or `~/.bash_login`, add the commands there as well.
-     If you have none of these, create a `~/.profile` and add the commands there.
-
-     * to add to `~/.profile`:
-       ``` bash
-       echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.profile
-       echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.profile
-       echo 'eval "$(pyenv init - bash)"' >> ~/.profile
-       ```
-     * to add to `~/.bash_profile`:
-       ```bash
-       echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile
-       echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bash_profile
-       echo 'eval "$(pyenv init - bash)"' >> ~/.bash_profile
-       ```
-
-   **Bash warning**: There are some systems where the `BASH_ENV` variable is configured
-   to point to `.bashrc`. On such systems, you should almost certainly put the
-   `eval "$(pyenv init - bash)"` line into `.bash_profile`, and **not** into `.bashrc`. Otherwise, you
-   may observe strange behaviour, such as `pyenv` getting into an infinite loop.
-   See [#264](https://github.com/pyenv/pyenv/issues/264) for details.
-   
-   </details>
-   
-#### Zsh
-  
-  <details>
-  Add Pyenv startup commands to `~/.zshrc` by running the following in your terminal:
-  
-  ```zsh
-  echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.zshrc
-  echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.zshrc
-  echo 'eval "$(pyenv init - zsh)"' >> ~/.zshrc
-  ```
-  
-  If you wish to get Pyenv in noninteractive login shells as well, also add the commands to `~/.zprofile` or `~/.zlogin`.
-  </details>
-
-#### Fish
-
-  <details>
-
-  1. If you have Fish 3.2.0 or newer, execute this interactively:
-     ```fish
-     set -Ux PYENV_ROOT $HOME/.pyenv
-     test -d $PYENV_ROOT/bin; and fish_add_path $PYENV_ROOT/bin
-     ```
-
-  2. Otherwise, execute the snippet below:
-     ```fish
-     set -Ux PYENV_ROOT $HOME/.pyenv
-     test -d $PYENV_ROOT/bin; and set -U fish_user_paths $PYENV_ROOT/bin $fish_user_paths
-     ```
-
-  3. Now, add this to `~/.config/fish/config.fish`:
-     ```fish
-     pyenv init - fish | source
-     ```
-  </details>
-
-#### Nushell
-
-  <details>
-
-  Add the following lines to your `config.nu` to add Pyenv and its shims to your `PATH`.
-  Shell integration (completions and subcommands changing the shell's state)
-  isn't currently supported.
-
-  ~~~ nu
-  $env.PYENV_ROOT = "~/.pyenv" | path expand
-  if (( $"($env.PYENV_ROOT)/bin" | path type ) == "dir") {
-    $env.PATH = $env.PATH | prepend $"($env.PYENV_ROOT)/bin" }
-  $env.PATH = $env.PATH | prepend $"(pyenv root)/shims"
-  ~~~
-
-  </details>
-
-#### Microsoft PowerShell
-
-  <details>
-
-  Add the commands to `$profile.CurrentUserAllHosts` by running the following in your terminal:
-
-  ~~~ pwsh
-  echo '$Env:PYENV_ROOT="$Env:HOME/.pyenv"' >> $profile.CurrentUserAllHosts
-  echo 'if (Test-Path -LP "$Env:PYENV_ROOT/bin" -PathType Container) { 
-    $Env:PATH="$Env:PYENV_ROOT/bin:$Env:PATH" }' >> $profile.CurrentUserAllHosts
-  echo 'iex ((pyenv init -) -join "`n")' >> $profile.CurrentUserAllHosts
-  ~~~
-
-  </details>
-
 ----

 ## Development

 The pyenv source code is [hosted on
-GitHub](https://github.com/pyenv/pyenv).
+GitHub](https://github.com/pyenv/pyenv).  It's clean, modular,
+and easy to understand, even if you're not a shell hacker.

-Tests are executed using [Bats](https://github.com/bats-core/bats-core).
-See the [tests README](test/README.md) for details.
+Tests are executed using [Bats](https://github.com/bats-core/bats-core):
+
+    bats test
+    bats/test/<file>.bats


 ### Contributing
--- a/libexec/pyenv---version
+++ b/libexec/pyenv---version
@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-version="2.8.5"
+version="2.6.28"
 git_revision=""

 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
--- a/libexec/pyenv-global
+++ b/libexec/pyenv-global
@ -36,16 +36,12 @@ if [ -n "$versions" ]; then
  pyenv-version-file-write "$PYENV_VERSION_FILE" "${versions[@]}"
 else
  OLDIFS="$IFS"
-  # VAR=() of unquoted value does glob expansion (against the current dir's contents) after IFS-splitting
-  # which is undesired
-  set -f
  IFS=: versions=($(
    pyenv-version-file-read "$PYENV_VERSION_FILE" ||
    pyenv-version-file-read "${PYENV_ROOT}/global" ||
    pyenv-version-file-read "${PYENV_ROOT}/default" ||
    echo system
  ))
-  set +f
  IFS="$OLDIFS"
  for version in "${versions[@]}"; do
    echo "$version"
--- a/libexec/pyenv-init
+++ b/libexec/pyenv-init
@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 # Summary: Configure the shell environment for pyenv
-# Usage: eval "$(pyenv init [-|--path] [--no-push-path] [--no-rehash] [<shell>])"
-#        pyenv init --install [<shell>]
-#        pyenv init --detect-shell [<shell>]
+# Usage: eval "$(pyenv init [-|--path] [--no-push-path] [--detect-shell] [--no-rehash] [<shell>])"

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@ -11,7 +9,6 @@ set -e
 if [ "$1" = "--complete" ]; then
  echo -
  echo --path
-  echo --install
  echo --no-push-path
  echo --no-rehash
  echo --detect-shell
@ -33,9 +30,6 @@ while [ "$#" -gt 0 ]; do
    --path)
      mode="path"
      ;;
-    --install)
-      mode="install"
-      ;;
    --detect-shell)
      mode="detect-shell"
      ;;
@ -87,23 +81,21 @@ function main() {
    exit 0
    ;;
  "detect-shell")
-    detect_profile
+    detect_profile 1
    print_detect_shell
    exit 0
    ;;
-  "install")
-    install_shell_startup_files
-    exit 0
-    ;;
  esac
  # should never get here
  exit 2
 }

 function detect_profile() {
+  local detect_for_detect_shell="$1"
+
  case "$shell" in
  bash )
-    if [ -e "${HOME}/.bash_profile" ]; then
+    if [ -e '~/.bash_profile' ]; then
      profile='~/.bash_profile'
    else
      profile='~/.profile'
@ -111,10 +103,6 @@ function detect_profile() {
    profile_explain="~/.bash_profile if it exists, otherwise ~/.profile"
    rc='~/.bashrc'
    ;;
-  fish )
-    profile='~/.config/fish/config.fish'
-    rc='~/.config/fish/config.fish'
-    ;;
  pwsh )
    profile='~/.config/powershell/profile.ps1'
    rc='~/.config/powershell/profile.ps1'
@ -133,10 +121,13 @@ function detect_profile() {
    rc='~/.profile'
    ;;
  * )
-    profile=
-    rc=
-    profile_explain='your shell'\''s login startup file'
-    rc_explain='your shell'\''s interactive startup file'
+    if [ -n "$detect_for_detect_shell" ]; then
+      profile=
+      rc=
+    else
+      profile='your shell'\''s login startup file'
+      rc='your shell'\''s interactive startup file'
+    fi
    ;;
  esac
 }
@ -155,32 +146,38 @@ function help_() {
      echo "# Add pyenv executable to PATH by running"
      echo "# the following interactively:"
      echo
-      print_fish_user_path_setup
+      echo 'set -Ux PYENV_ROOT $HOME/.pyenv'
+      echo 'set -U fish_user_paths $PYENV_ROOT/bin $fish_user_paths'
      echo
      echo "# Load pyenv automatically by appending"
      echo "# the following to ~/.config/fish/config.fish:"
      echo
-      print_fish_shell_setup
+      echo 'pyenv init - fish | source'
      echo
      ;;
    pwsh )
      echo '# Load pyenv automatically by appending'
      echo "# the following to $profile :"
      echo
-      print_pwsh_shell_setup
+      echo '$Env:PYENV_ROOT="$Env:HOME/.pyenv"'
+      echo 'if (Test-Path -LP "$Env:PYENV_ROOT/bin" -PathType Container) {'
+      echo '  $Env:PATH="$Env:PYENV_ROOT/bin:$Env:PATH" }'
+      echo 'iex ((pyenv init -) -join "`n")'
      ;;
    * )
      echo '# Load pyenv automatically by appending'
      echo -n "# the following to "
-      if [[ "$profile" == "$rc" && -z $rc_explain ]]; then
-        echo "${profile_explain:-$profile} :"
+      if [ "$profile" == "$rc" ]; then
+        echo "$profile :"
      else
        echo
        echo "# ${profile_explain:-$profile} (for login shells)"
-        echo "# and ${rc_explain:-$rc} (for interactive shells) :"
+        echo "# and $rc (for interactive shells) :"
      fi
      echo
-      print_posix_shell_setup
+      echo 'export PYENV_ROOT="$HOME/.pyenv"'
+      echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"'
+      echo 'eval "$(pyenv init - '$shell')"'
      ;;
    esac
    echo
@ -189,154 +186,6 @@ function help_() {
  } >&2
 }

-function print_posix_shell_setup() {
-  echo 'export PYENV_ROOT="$HOME/.pyenv"'
-  echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"'
-  echo 'eval "$(pyenv init - '$shell')"'
-}
-
-function print_fish_shell_setup() {
-  echo 'pyenv init - fish | source'
-}
-
-function print_fish_user_path_setup() {
-  echo 'set -Ux PYENV_ROOT $HOME/.pyenv'
-  echo 'if functions -q fish_add_path'
-  echo '  test -d $PYENV_ROOT/bin; and fish_add_path $PYENV_ROOT/bin'
-  echo 'else'
-  echo '  test -d $PYENV_ROOT/bin; and set -U fish_user_paths $PYENV_ROOT/bin $fish_user_paths'
-  echo 'end'
-}
-
-function print_pwsh_shell_setup() {
-  echo '$Env:PYENV_ROOT="$Env:HOME/.pyenv"'
-  echo 'if (Test-Path -LP "$Env:PYENV_ROOT/bin" -PathType Container) {'
-  echo '  $Env:PATH="$Env:PYENV_ROOT/bin:$Env:PATH" }'
-  echo 'iex ((pyenv init -) -join "`n")'
-}
-
-function expand_home_path() {
-  local path="$1"
-  printf '%s\n' "${path/#\~/$HOME}"
-}
-
-function install_shell_startup_files() {
-  if [[ -z $HOME ]]; then
-    echo "pyenv: HOME must be set to configure shell startup files" >&2
-    return 1
-  fi
-
-  detect_profile
-
-  local files=()
-  local lines=()
-  local profile_path rc_path setup
-
-  case "$shell" in
-  bash | zsh | ksh | ksh93 | mksh )
-    rc_path="$(expand_home_path "$rc")"
-    profile_path="$(expand_home_path "$profile")"
-    setup="$(print_posix_shell_setup)"
-    files=("$rc_path")
-    lines=("$setup")
-    if [[ $profile_path != "$rc_path" ]]; then
-      files+=("$profile_path")
-      lines+=("$setup")
-    fi
-    ;;
-  fish )
-    rc_path="$(expand_home_path "$rc")"
-    files=("$rc_path")
-    lines=("$(print_fish_shell_setup)")
-    ;;
-  pwsh )
-    rc_path="$(expand_home_path "$rc")"
-    files=("$rc_path")
-    lines=("$(print_pwsh_shell_setup)")
-    ;;
-  * )
-    echo "pyenv: cannot automatically configure startup files for $shell" >&2
-    return 1
-    ;;
-  esac
-
-  local index
-  for ((index = 0; index < ${#files[@]}; index++)); do
-    check_startup_file "${files[$index]}" || return 1
-  done
-
-  if [[ $shell == fish ]]; then
-    install_fish_user_paths || return 1
-  fi
-
-  for ((index = 0; index < ${#files[@]}; index++)); do
-    append_lines "${files[$index]}" "${lines[$index]}"
-  done
-}
-
-function check_startup_file() {
-  local file="$1"
-  local grep_status
-
-  if [[ ! -e $file ]]; then
-    return 0
-  fi
-
-  if [[ ! -f $file || ! -r $file ]]; then
-    echo "pyenv: failed to inspect $file" >&2
-    return 1
-  fi
-
-  if grep -Fi pyenv "$file" >/dev/null; then
-    echo "pyenv: cannot automatically apply changes to $file: it appears to already contain Pyenv-related code." >&2
-    echo "pyenv: review the file's contents and apply changes manually if necessary." >&2
-    echo "pyenv: run \`pyenv init $shell\` to see the suggested setup." >&2
-    return 1
-  else
-    grep_status=$?
-    if [[ $grep_status == 1 ]]; then
-      return 0
-    fi
-    echo "pyenv: failed to inspect $file" >&2
-    return "$grep_status"
-  fi
-}
-
-function install_fish_user_paths() {
-  local fish_setup
-
-  if ! command -v fish >/dev/null; then
-    echo "pyenv: fish is not available to configure fish universal variables" >&2
-    return 1
-  fi
-
-  fish_setup="$(print_fish_user_path_setup)"
-  if ! fish -c "$fish_setup"; then
-    echo "pyenv: failed to configure fish universal variables" >&2
-    return 1
-  fi
-}
-
-function append_lines() {
-  local file="$1"
-  local lines="$2"
-  local dir last_char
-
-  dir="${file%/*}"
-  if [[ $dir != "$file" ]]; then
-    mkdir -p "$dir"
-  fi
-
-  if [[ -s $file ]]; then
-    last_char="$(tail -c 1 "$file")" || return 1
-    if [[ -n $last_char ]]; then
-      echo >> "$file"
-    fi
-  fi
-
-  printf '%s\n' "$lines" >> "$file"
-}
-
 function init_dirs() {
  mkdir -p "${PYENV_ROOT}/"{shims,versions}
 }
@ -473,12 +322,12 @@ function pyenv {
  }

  if ( ("${commands[*]}" -split ' ') -contains \$command ) {
-    \$shell_cmds = (& (get-command -commandtype application pyenv -totalcount 1) sh-\$command \$args)
+    \$shell_cmds = (& (get-command -commandtype application pyenv) sh-\$command \$args)
    if ( \$shell_cmds.Count -gt 0 ) {
      iex (\$shell_cmds -join "\`n")
    }
  } else {
-    & (get-command -commandtype application pyenv -totalcount 1) \$command \$args
+    & (get-command -commandtype application pyenv) \$command \$args
  }
 }
 EOS
--- a/libexec/pyenv-local
+++ b/libexec/pyenv-local
@ -59,11 +59,7 @@ elif [ -n "$versions" ]; then
  pyenv-version-file-write ${FORCE:+-f }.python-version "${versions[@]}"
 else
  if version_file="$(pyenv-version-file "$PWD")"; then
-    # VAR=() of unquoted value does glob expansion (against the current dir's contents) after IFS-splitting
-    # which is undesired
-    set -f
    IFS=: versions=($(pyenv-version-file-read "$version_file"))
-    set +f
    for version in "${versions[@]}"; do
      echo "$version"
    done
--- a/libexec/pyenv-prefix
+++ b/libexec/pyenv-prefix
@ -28,9 +28,6 @@ fi
 PYENV_PREFIX_PATHS=()
 OLDIFS="$IFS"
 { IFS=:
-  # Unquoted $VAR does glob expansion (against the current dir's contents) after IFS-splitting
-  # which is undesired
-  set -f
  for version in ${PYENV_VERSION}; do
    if [ "$version" = "system" ]; then
      if PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python --skip-advice 2>/dev/null)" || \
@ -55,7 +52,6 @@ OLDIFS="$IFS"
      exit 1
    fi
  done
-  set +f
 }
 IFS="$OLDIFS"

--- a/libexec/pyenv-rehash
+++ b/libexec/pyenv-rehash
@ -2,7 +2,7 @@
 # Summary: Rehash pyenv shims (run this after installing executables)

 set -e
-[[ -n "$PYENV_DEBUG" ]] && set -x
+[ -n "$PYENV_DEBUG" ] && set -x

 SHIM_PATH="${PYENV_ROOT}/shims"
 PROTOTYPE_SHIM_PATH="${SHIM_PATH}/.pyenv-shim"
@ -13,33 +13,15 @@ mkdir -p "$SHIM_PATH"
 declare last_acquire_error

 acquire_lock() {
+  # Ensure only one instance of pyenv-rehash is running at a time by
+  # setting the shell's `noclobber` option and attempting to write to
+  # the prototype shim file. If the file already exists, print a warning
+  # to stderr and exit with a non-zero status.
  local ret
-  # An old lock file is presumed stale. We assume no healthy rehash takes this long.
-  # The time is picked very small so that a killed rehash holds up new shell sessions
-  # for as little as possible
-  find "$PROTOTYPE_SHIM_PATH" -mmin +2 -exec rm -f {} \; 2>/dev/null || true
  set -o noclobber
-  last_acquire_error="$( { ( echo -n > "$PROTOTYPE_SHIM_PATH"; ) 2>&1 1>&3 3>&1-; } 3>&1)" \
-    && trap release_lock EXIT \
-    || {
-      # Linux Landlock and MacOS Seatbelt sandbox subsystems return false information in access(),
-      # making -w "$SHIM_PATH" not catch the fact that the shims dir is not writable in this case.
-      # Bash doesn't provide access to errno to check for non-EEXIST error code in `echo >'.
-      # So check for writablity by trying to write to a different file,
-      # in a way that taxes the usual use case as little as possible.
-      if [[ -z $tested_for_other_write_errors ]]; then
-        # if lots of (50+) rehashes run concurrently, another concurrent rehash
-        # may delete the temporary file in remove_*_shims() before we do so
-        ( t="$(TMPDIR="$SHIM_PATH" mktemp)" && rm -f "$t" ) \
-          && tested_for_other_write_errors=1 \
-          || { echo "pyenv: cannot rehash: $SHIM_PATH isn't writable" >&2
-               set +o noclobber
-               exit 1; }
-      fi
-      ret=1
-    }
+  last_acquire_error="$( { ( echo -n > "$PROTOTYPE_SHIM_PATH"; ) 2>&1 1>&3 3>&1-; } 3>&1)" || ret=1
  set +o noclobber
-  [[ -z "${ret}" ]]
+  [ -z "${ret}" ]
 }

 remove_prototype_shim() {
@ -48,7 +30,6 @@ remove_prototype_shim() {

 release_lock() {
  remove_prototype_shim
-  trap - EXIT
 }

 if [ ! -w "$SHIM_PATH" ]; then
@ -62,8 +43,22 @@ PYENV_REHASH_TIMEOUT=${PYENV_REHASH_TIMEOUT:-60}
 while (( SECONDS <= start + PYENV_REHASH_TIMEOUT )); do
  if acquire_lock; then
    acquired=1
+
+    # If we were able to obtain a lock, register a trap to clean up the
+    # prototype shim when the process exits.
+    trap release_lock EXIT
+
    break
  else
+    #Landlock sandbox subsystem in the Linux kernel returns false information in access() as of 6.14.0,
+    # making -w "$SHIM_PATH" not catch the fact that the shims dir is not writable in this case.
+    #Bash doesn't provide access to errno to check for non-EEXIST error code in acquire_lock.
+    #So check for writablity by trying to write to a different file,
+    # in a way that taxes the usual use case as little as possible.
+    if [[ -z $tested_for_other_write_errors ]]; then
+      ( t="$(TMPDIR="$SHIM_PATH" mktemp)" && rm "$t" ) && tested_for_other_write_errors=1 ||
+        { echo "pyenv: cannot rehash: $SHIM_PATH isn't writable" >&2; break; }
+    fi
    # POSIX sleep(1) doesn't provide subsecond precision, but many others do
    sleep 0.1 2>/dev/null || sleep 1
  fi
--- a/libexec/pyenv-version
+++ b/libexec/pyenv-version
@ -9,11 +9,7 @@ set -e

 exitcode=0
 OLDIFS="$IFS"
-# VAR=() of unquoted value does glob expansion (against the current dir's contents) after IFS-splitting
-# which is undesired
-set -f
 IFS=: PYENV_VERSION_NAMES=($(pyenv-version-name)) || exitcode=$?
-set +f
 IFS="$OLDIFS"

 unset bare
--- a/libexec/pyenv-version-file
+++ b/libexec/pyenv-version-file
@ -8,28 +8,12 @@ target_dir="$1"

 find_local_version_file() {
  local root="$1"
-  # Nonexistent paths are UB as of this writing.
-  # Relative ones cause a failure but absolute ones don't
-  [[ $root != /* ]] && root=$(CDPATH= cd -- "$root" && pwd)
-  # Original Rbenv code supports UNC notation for Cygwin/MinGW
-  # (https://github.com/rbenv/rbenv/pull/529)
-  # POSIX.1-2024 still allows to treat //<name> in implementation-specific manner
-  # (https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/V1_chap04.html#tag_04_16)
-  # even though few UNIX variants do that
-  local unc; [[ $root =~ ^//[^/] && ! / -ef // ]] && unc=1
-  root="${root%/}"
-  # when testing root, $root is ""
-  while true; do
-    # don't test //.python-version if // is special
-    # as it's pointless and possibly very slow
-    # if it e.g. leads to a network search
-    [[ $unc && $root == / ]] && break
-    
-    if [[ -f $root/.python-version ]]; then
-      echo "$root/.python-version"
+  while ! [[ "$root" =~ ^//[^/]*$ ]]; do
+    if [ -f "${root}/.python-version" ]; then
+      echo "${root}/.python-version"
      return 0
    fi
-    [[ -n $root ]] || break
+    [ -n "$root" ] || break
    root="${root%/*}"
  done
  return 1
@ -38,9 +22,7 @@ find_local_version_file() {
 if [ -n "$target_dir" ]; then
  find_local_version_file "$target_dir"
 else
-  # In tests, PYENV_DIR is not set, ultimately leading to "cd: null directory" in OpenSUSE
-  # While most `cd` implementations treat an empty argument the same as missing, that's still wrong
-  find_local_version_file "${PYENV_DIR:=$PWD}" || {
+  find_local_version_file "$PYENV_DIR" || {
    [ "$PYENV_DIR" != "$PWD" ] && find_local_version_file "$PWD"
  } || echo "${PYENV_ROOT}/version"
 fi
--- a/libexec/pyenv-version-name
+++ b/libexec/pyenv-version-name
@ -46,21 +46,16 @@ versions=()
 OLDIFS="$IFS"
 { IFS=:
  any_not_installed=0
-  normalization_done=
-  # Unquoted $VAR does glob expansion (against the current dir's contents) after IFS-splitting
-  # which is undesired
-  set -f
  for version in ${PYENV_VERSION}; do
    # Remove the explicit 'python-' prefix from versions like 'python-3.12'.
    normalised_version="${version#python-}"
-    [[ $version != "${normalised_version}" ]] && normalization_done=1
-    if [[ $version == "system" ]] || version_exists "${normalised_version}" ; then
-      versions+=("${normalised_version}")
-    elif [[ -n $normalization_done ]] && version_exists "${version}"; then
+    if version_exists "${version}" || [ "$version" = "system" ]; then
      versions+=("${version}")
-    elif resolved_version="$(pyenv-latest -b "${normalised_version}")"; then
+    elif version_exists "${normalised_version}"; then
+      versions+=("${normalised_version}")
+    elif resolved_version="$(pyenv-latest -b "${version}")"; then
      versions+=("${resolved_version}")
-    elif [[ -n $normalization_done ]] && resolved_version="$(pyenv-latest -b "${version}")"; then
+    elif resolved_version="$(pyenv-latest -b "${normalised_version}")"; then
      versions+=("${resolved_version}")
    else
      if [[ -n $FORCE ]]; then
@ -71,7 +66,6 @@ OLDIFS="$IFS"
      fi
    fi
  done
-  set +f
 }
 IFS="$OLDIFS"

--- a/libexec/pyenv-versions
+++ b/libexec/pyenv-versions
@ -99,9 +99,6 @@ else
  miss_prefix="  "
  OLDIFS="$IFS"
  IFS=:
-  # VAR=() of unquoted value does glob expansion (against the current dir's contents) after IFS-splitting
-  # which is undesired
-  set -f
  if ((${BASH_VERSINFO[0]} > 3)); then
    for i in $(pyenv-version-name || true); do
      current_versions["$i"]="1"
@ -109,7 +106,6 @@ else
  else
    current_versions=($(pyenv-version-name || true))
  fi
-  set +f
  IFS="$OLDIFS"
  include_system="1"
 fi
@ -165,15 +161,11 @@ versions_dir_entries=("$versions_dir"/*)
 if sort --version-sort </dev/null >/dev/null 2>&1; then
    # system sort supports version sorting
    OLDIFS="$IFS"
-    # VAR=() of unquoted value does glob expansion (against the current dir's contents) after IFS-splitting
-    # which is undesired
-    set -f
    IFS=$'\n'
    versions_dir_entries=($(
        printf "%s\n" "${versions_dir_entries[@]}" |
        sort --version-sort
    ))
-    set +f
    IFS="$OLDIFS"
 fi

--- a/libexec/pyenv-which
+++ b/libexec/pyenv-which
@ -63,11 +63,7 @@ if [ -z "$PYENV_COMMAND" ]; then
 fi

 OLDIFS="$IFS"
-# Unquoted $VAR or VAR=() of unquoted value does glob expansion (against the current dir's contents)
-# after IFS-splitting which is undesired
-set -f
 IFS=: versions=(${PYENV_VERSION:-$(pyenv-version-name -f)})
-set +f
 IFS="$OLDIFS"

 declare -a nonexistent_versions
--- a/plugins/.gitignore
+++ b/plugins/.gitignore
@ -2,6 +2,4 @@
 !/.gitignore
 !/version-ext-compat
 !/python-build
-!/pyenv-binary
-!/pyenv-link
 /python-build/test/build
--- a/plugins/pyenv-binary/README.md
+++ b/plugins/pyenv-binary/README.md
@ -1,94 +0,0 @@
-# pyenv-binary (experimental)
-
-Package an installed Python version into a relocatable archive that can be
-installed on another machine.
-
-This is experimental and intentionally decoupled: it does not change
-`pyenv install` or any other command. You drive it explicitly through
-`pyenv binary`. Run `pyenv binary <command> --help` for details on a command.
-
-## Portability
-
-An archive is portable across machines that share its build platform (OS,
-architecture and a compatible libc) and have the recorded system libraries. It
-is not portable across, say, glibc and musl, or to an older glibc; the platform
-and dependency metadata exist to catch that.
-
-## Commands
-
-### `pyenv binary package [-v|--verbose] <version>[:<entry>] --archive-base-url <url>`
-
-Installs `<version>` from source under a separate name, packages that install
-with `save`, then emits a python-build definition for it with
-`generate-installer`. With no explicit entry, the name is generated from the
-current platform, platform version and architecture. An explicit entry keeps
-the existing custom-build workflow.
-
-Pass `-v` to show build progress from `pyenv install`.
-
-```sh
-pyenv binary package 3.12.7 \
-  --archive-base-url https://example.com/binaries
-# On Debian 12 x86_64, writes 3.12.7-debian-12-x86_64.tar.gz,
-# its .meta file and a `3.12.7-debian-12-x86_64' definition.
-
-pyenv binary package 3.12.7:company-python \
-  --archive-base-url https://example.com/binaries
-```
-
-The archive, metadata and definition land in the current directory, named after
-the entry. Host the archive under `<url>` and drop the definition into
-python-build's definition directory.
-
-### `pyenv binary package-name <version>`
-
-Prints the automatically generated entry name without building anything. Linux
-uses the distribution name and version, macOS uses the macOS version, and other
-systems use the name and release reported by `uname`. All names include the
-architecture.
-
-```sh
-pyenv binary package-name 3.12.7
-# 3.12.7-debian-12-x86_64
-```
-
-### `pyenv binary save <version> [<output-dir>] [--name <name>]`
-
-Packs an installed version into `<version>-<platform>.tar.gz` (relative paths)
-and writes `<version>-<platform>.meta` describing the build platform (OS, arch,
-distro and libc version) and the system libraries the build links against. Use
-`--name` to set a different base name for both files.
-
-```sh
-pyenv binary save 3.12.7 ./dist
-```
-
-### `pyenv binary generate-installer <metadata-file> --archive-url <url> [-o <output>]`
-
-Reads a `.meta` file and emits a python-build definition. Drop it into
-python-build's definition directory and `pyenv install <name>` installs the
-archive like any other version. The archive location is a parameter, so you can
-host it anywhere (it does not have to be a pyenv location); the archive itself
-must sit next to the `.meta` file so its checksum can be baked into the
-definition.
-
-The definition refuses to install on a different OS/architecture, or an older
-glibc, than the archive was built for, and checks that the system libraries it
-needs are present.
-
-```sh
-pyenv binary generate-installer ./dist/3.12.7-linux-x86_64.meta \
-  --archive-url https://example.com/3.12.7-linux-x86_64.tar.gz \
-  -o "$(pyenv root)/plugins/python-build/share/python-build/3.12.7-linux-x86_64"
-
-pyenv install 3.12.7-linux-x86_64
-```
-
-### `pyenv binary relocate <prefix>`
-
-Rewrites the rpaths of a Python tree unpacked into `<prefix>` so the interpreter
-and its extension modules load the bundled libraries from there rather than from
-the path the archive was built at. Uses `patchelf`. The generated definition
-calls this; you rarely run it by hand.
-
-Relocation is implemented for Linux; macOS is not wired up yet.
--- a/plugins/pyenv-binary/bin/pyenv-binary
+++ b/plugins/pyenv-binary/bin/pyenv-binary
@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-#
-# Summary: Package an installed Python version as a relocatable binary (experimental)
-#
-# Usage: pyenv binary <command> [<args>]
-#
-# `pyenv binary` packages an already-installed Python version into a relocatable
-# archive that can be installed on another machine. It is experimental and does
-# not touch `pyenv install' or any other command.
-#
-# Run `pyenv binary' to list its commands, or `pyenv binary <command> --help'
-# for command-specific help.
-#
-set -e
-[ -n "$PYENV_DEBUG" ] && set -x
-
-libexec="${BASH_SOURCE%/*}/../libexec"
-
-# The pyenv launcher only puts a plugin's bin on PATH, but `pyenv-help' looks a
-# command up there. Add our libexec so the subcommands, and the help text they
-# print, can be found.
-export PATH="${libexec}:${PATH}"
-
-list_commands() {
-  local path
-  for path in "$libexec"/pyenv-binary-*; do
-    [ -e "$path" ] && echo "${path##*/pyenv-binary-}"
-  done
-}
-
-# Provide pyenv completions
-if [ "$1" = "--complete" ]; then
-  shift
-  if [ -z "$1" ]; then
-    list_commands
-  else
-    command_path="${libexec}/pyenv-binary-$1"
-    shift
-    [ -x "$command_path" ] && exec "$command_path" --complete "$@"
-  fi
-  exit
-fi
-
-subcommand="$1"
-if [ -z "$subcommand" ]; then
-  { pyenv-help binary
-    echo
-    echo "Commands:"
-    list_commands | sed 's/^/   /'
-  } >&2
-  exit 1
-fi
-shift
-
-command_path="${libexec}/pyenv-binary-${subcommand}"
-if [ ! -x "$command_path" ]; then
-  echo "pyenv-binary: no such command \`${subcommand}'" >&2
-  exit 1
-fi
-
-if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
-  exec pyenv-help "binary-${subcommand}"
-fi
-
-exec "$command_path" "$@"
--- a/plugins/pyenv-binary/libexec/pyenv-binary-generate-installer
+++ b/plugins/pyenv-binary/libexec/pyenv-binary-generate-installer
@ -1,224 +0,0 @@
-#!/usr/bin/env bash
-#
-# Summary: Generate a python-build definition for a saved binary archive
-#
-# Usage: pyenv binary generate-installer <metadata-file> --archive-url <url> [-o <output>]
-#
-#   Reads a metadata file written by `pyenv binary save' and emits a python-build
-#   definition. Dropped into python-build's definition directory, it installs the
-#   archive like any other version: `pyenv install' downloads it from <url>,
-#   checks the platform and the required system libraries, unpacks it, then
-#   rewrites rpaths so the copy runs from its prefix.
-#
-#   The archive must sit next to the metadata file so its checksum can be baked
-#   into the definition; `pyenv binary save' writes the two together.
-#
-#   <metadata-file>       A .meta file written by `pyenv binary save'.
-#                         The corresponding binary package written by `pyenv binary save'
-#                         needs to be present alongside it.
-#   --archive-url <url>   The URL for the resulting installation script to download
-#                         the package from.
-#   -o <output>           Write the definition here (default: stdout).
-#
-set -e
-[ -n "$PYENV_DEBUG" ] && set -x
-
-# Provide pyenv completions
-if [ "$1" = "--complete" ]; then
-  echo --archive-url
-  echo -o
-  exit
-fi
-
-metadata=""
-archive_url=""
-output=""
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-  --archive-url )
-    [ $# -ge 2 ] || { echo "pyenv-binary: --archive-url needs a value" >&2; exit 1; }
-    archive_url="$2"; shift 2 ;;
-  -o )
-    [ $# -ge 2 ] || { echo "pyenv-binary: -o needs a value" >&2; exit 1; }
-    output="$2"; shift 2 ;;
-  -* )
-    echo "pyenv-binary: unknown option \`$1'" >&2; exit 1 ;;
-  * )
-    [ -z "$metadata" ] || { echo "pyenv-binary: unexpected argument \`$1'" >&2; exit 1; }
-    metadata="$1"; shift ;;
-  esac
-done
-
-if [ -z "$metadata" ] || [ -z "$archive_url" ]; then
-  pyenv-help --usage binary-generate-installer >&2
-  exit 1
-fi
-
-version="" os="" arch="" distro="" libc="" build_prefix="" archive=""
-deps=""
-while IFS='=' read -r key value; do
-  case "$key" in
-  version ) version="$value" ;;
-  os ) os="$value" ;;
-  arch ) arch="$value" ;;
-  distro ) distro="$value" ;;
-  libc ) libc="$value" ;;
-  build_prefix ) build_prefix="$value" ;;
-  archive ) archive="$value" ;;
-  dep ) deps="${deps:+$deps }$value" ;;
-  esac
-done < "$metadata"
-
-# Fail here if the metadata is incomplete, rather than bake a blank into the
-# definition where a missing arch would give a confusing platform error.
-for field in version os arch archive; do
-  if [ -z "${!field}" ]; then
-    echo "pyenv-binary: metadata is missing \`${field}'" >&2
-    exit 1
-  fi
-done
-
-# Mach-O load commands contain the prefix where Python was built.
-if [ "$os" = "Darwin" ] && [ -z "$build_prefix" ]; then
-  echo "pyenv-binary: metadata is missing \`build_prefix'" >&2
-  exit 1
-fi
-
-# The glibc floor only applies on Linux; require it there so the definition can
-# tell whether the target is new enough to run the binaries.
-if [ "$os" = "Linux" ] && [ -z "$libc" ]; then
-  echo "pyenv-binary: metadata is missing \`libc'" >&2
-  exit 1
-fi
-
-# python-build downloads the archive itself, so the checksum has to be baked in.
-# The archive sits next to the metadata `save' wrote it alongside.
-archive_path="$(dirname "$metadata")/${archive}"
-if [ ! -r "$archive_path" ]; then
-  echo "pyenv-binary: cannot read the archive \`${archive_path}' to checksum it" >&2
-  exit 1
-fi
-if command -v sha256sum >/dev/null 2>&1; then
-  sha256="$(sha256sum "$archive_path")"; sha256="${sha256%% *}"
-elif command -v shasum >/dev/null 2>&1; then
-  sha256="$(shasum -a 256 "$archive_path")"; sha256="${sha256%% *}"
-elif command -v openssl >/dev/null 2>&1; then
-  sha256="$(openssl dgst -sha256 "$archive_path")"; sha256="${sha256##* }"
-else
-  echo "pyenv-binary: need sha256sum, shasum or openssl to checksum the archive" >&2
-  exit 1
-fi
-
-emit() {
-  # The values known now go in as %q-quoted assignments so a stray quote or space
-  # in the URL or metadata cannot break the definition or inject into it. The body
-  # below is a quoted here-doc, verbatim.
-  {
-    printf '# python-build definition for prebuilt Python %s (%s/%s%s).\n' \
-      "$version" "$os" "$arch" "${distro:+, $distro}"
-    echo "# Generated by \`pyenv binary generate-installer'."
-    echo
-    printf 'EXPECT_OS=%q\n' "$os"
-    printf 'EXPECT_ARCH=%q\n' "$arch"
-    printf 'EXPECT_LIBC=%q\n' "$libc"
-    printf 'BUILD_PREFIX=%q\n' "$build_prefix"
-    printf 'VERSION=%q\n' "$version"
-    printf 'ARCHIVE_URL=%q\n' "$archive_url"
-    printf 'SHA256=%q\n' "$sha256"
-    printf 'DEPS=%q\n' "$deps"
-  }
-  cat <<'EOF'
-
-os="$(uname -s)"
-arch="$(uname -m)"
-if [ "$os" != "$EXPECT_OS" ] || [ "$arch" != "$EXPECT_ARCH" ]; then
-  echo "pyenv-binary: this archive is for ${EXPECT_OS}/${EXPECT_ARCH}, not ${os}/${arch}" >&2
-  exit 1
-fi
-
-# Refuse a target whose glibc is older than the one the archive was built on;
-# the dynamic loader would reject the binaries.
-case "$EXPECT_LIBC" in
-"glibc "* )
-  build_libc="${EXPECT_LIBC#glibc }"
-  target_libc="$(getconf GNU_LIBC_VERSION 2>/dev/null || true)"
-  case "$target_libc" in
-  "glibc "* )
-    target_libc="${target_libc#glibc }"
-    older="$(printf '%s\n%s\n' "$build_libc" "$target_libc" | sort -V | head -n1)"
-    if [ "$older" = "$target_libc" ] && [ "$target_libc" != "$build_libc" ]; then
-      echo "pyenv-binary: archive needs glibc ${build_libc} or newer, but this system has ${target_libc}" >&2
-      exit 1
-    fi
-    ;;
-  esac
-  ;;
-esac
-
-# Required system libraries must already be present on the target. Linux lists
-# the soname first; FreeBSD lists it in the resolved path, so normalize that
-# path before matching exact names.
-cache=""
-if command -v ldconfig &>/dev/null; then
-  case "$os" in
-  FreeBSD )
-    cache="$(ldconfig -r 2>/dev/null)" &&
-      cache="$(printf '%s\n' "$cache" | awk -F ' *=> *' '{ sub(/^.*\//, "", $2); print $2 }')" \
-      || cache=""
-    ;;
-  * )
-    cache="$(ldconfig -p 2>/dev/null)" || cache=""
-    ;;
-  esac
-fi
-if [ -n "$cache" ]; then
-  missing=""
-  for dep in $DEPS; do
-    printf '%s\n' "$cache" | awk -v d="$dep" '$1 == d { found = 1 } END { exit !found }' \
-      || missing="${missing} ${dep}"
-  done
-  if [ -n "$missing" ]; then
-    echo "pyenv-binary: missing required system libraries:${missing}" >&2
-    exit 1
-  fi
-elif [ -n "$DEPS" ]; then
-  echo "pyenv-binary: cannot check required system libraries (ldconfig cache unavailable)" >&2
-fi
-
-case "$os" in
-Darwin )
-  for tool in otool install_name_tool; do
-    if ! command -v "$tool" >/dev/null 2>&1; then
-      echo "pyenv-binary: need ${tool} to relocate the binary" >&2
-      exit 1
-    fi
-  done
-  ;;
-* )
-  if ! command -v patchelf >/dev/null 2>&1; then
-    echo "pyenv-binary: need patchelf to relocate the binary" >&2
-    exit 1
-  fi
-  ;;
-esac
-
-build_package_relocate() {
-  if [ "$os" = "Darwin" ]; then
-    pyenv binary relocate "$PREFIX_PATH" "$BUILD_PREFIX"
-  else
-    pyenv binary relocate "$PREFIX_PATH"
-  fi
-}
-
-install_package "Python-${VERSION}-binary" "${ARCHIVE_URL}#${SHA256}" copy relocate
-
-EOF
-}
-
-if [ -n "$output" ]; then
-  emit > "$output"
-  echo "Wrote definition to ${output}"
-else
-  emit
-fi
--- a/plugins/pyenv-binary/libexec/pyenv-binary-package
+++ b/plugins/pyenv-binary/libexec/pyenv-binary-package
@ -1,83 +0,0 @@
-#!/usr/bin/env bash
-#
-# Summary: Create an installable binary package from a Python version
-#
-# Usage: pyenv binary package [-v|--verbose] <version>[:<entry>] --archive-base-url <url>
-#
-#   Installs <version> from source under a separate entry name, saves it as a
-#   binary package, then emits a python-build definition for that package.
-#   The archive, metadata and definition are written to the current directory
-#   as <entry>.tar.gz, <entry>.meta and <entry>.
-#
-#   <version>             A version `pyenv install' knows how to build.
-#   <entry>               The optional name to build under and install the
-#                         binary as. If omitted, a name is generated from the
-#                         current platform, platform version and architecture.
-#   -v,--verbose          Show build progress from `pyenv install'.
-#   --archive-base-url <url>
-#                         Where the archive will be hosted; the definition
-#                         downloads it from <url>/<entry>.tar.gz.
-#
-set -e
-[ -n "$PYENV_DEBUG" ] && set -x
-
-# Provide pyenv completions
-if [ "$1" = "--complete" ]; then
-  echo --archive-base-url
-  echo --verbose
-  exec pyenv-install --list --bare
-fi
-
-spec=""
-archive_base_url=""
-verbose=""
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-  --archive-base-url )
-    [ $# -lt 2 ] && { echo "pyenv-binary: --archive-base-url needs a value" >&2; exit 1; }
-    archive_base_url="$2"; shift ;;
-  -v|--verbose)
-    verbose=1 ;;
-  -* )
-    echo "pyenv-binary: unknown option \`$1'" >&2; exit 1 ;;
-  * )
-    [ -z "$spec" ] || { echo "pyenv-binary: unexpected argument \`$1'" >&2; exit 1; }
-    spec="$1"
-    ;;
-  esac
-  shift
-done
-
-if [ -z "$spec" ] || [ -z "$archive_base_url" ]; then
-  pyenv-help --usage binary-package >&2
-  exit 1
-fi
-
-case "$spec" in
-*?:?* ) entry="${spec##*:}" ;;
-* ) entry="$(pyenv-binary-package-name "$spec")"; spec="${spec}:${entry}" ;;
-esac
-
-case "$entry" in
-# `pyenv install' reads a trailing `:latest' as part of the version rather than
-# as an alias, so nothing would end up installed under that name.
-latest )
-  echo "pyenv-binary: \`latest' cannot be used as an entry name" >&2
-  exit 1
-  ;;
-# The entry becomes a directory name under versions/. `pyenv install' does not
-# validate the alias, and `save' only checks once the build is done, so refuse
-# a name that could point elsewhere before compiling anything.
-*/* | .. | . )
-  echo "pyenv-binary: invalid entry name \`${entry}'" >&2
-  exit 1
-  ;;
-esac
-
-# `pyenv install' puts a `<version>:<alias>' build under versions/<alias>.
-pyenv-install ${verbose:+--verbose} "$spec"
-pyenv-binary-save "$entry" "$PWD" --name "$entry"
-
-pyenv-binary-generate-installer "${entry}.meta" \
-  --archive-url "${archive_base_url%/}/${entry}.tar.gz" -o "$entry"
--- a/plugins/pyenv-binary/libexec/pyenv-binary-package-name
+++ b/plugins/pyenv-binary/libexec/pyenv-binary-package-name
@ -1,73 +0,0 @@
-#!/usr/bin/env bash
-#
-# Summary: Generate a binary package name for the current platform
-#
-# Usage: pyenv binary package-name <version>
-#
-#   Prints a package name containing the Python version, platform name,
-#   platform version and architecture.
-#
-set -e
-[ -n "$PYENV_DEBUG" ] && set -x
-
-if [ "$1" = "--complete" ]; then
-  exec pyenv-install --list --bare
-fi
-
-if [ $# -ne 1 ]; then
-  pyenv-help --usage binary-package-name >&2
-  exit 1
-fi
-
-version="$1"
-
-case "$version" in
-*/* | .. | . | *[[:cntrl:]]* )
-  echo "pyenv-binary: invalid version name \`${version}'" >&2
-  exit 1
-  ;;
-esac
-
-version="$(pyenv-latest -f -k "$version")"
-
-os="$(uname -s)"
-arch="$(uname -m)"
-distro=""
-distro_version=""
-
-case "$os" in
-Linux )
-  if type -p lsb_release >/dev/null; then
-    distro="$(lsb_release -si)"
-    distro_version="$(lsb_release -sr)"
-  elif [ -r /etc/os-release ]; then
-    distro="$(. /etc/os-release && printf '%s' "${ID:-}")"
-    distro_version="$(. /etc/os-release && printf '%s' "${VERSION_ID:-}")"
-  fi
-  ;;
-Darwin )
-  distro="macos"
-  distro_version="$(sw_vers -productVersion)"
-  ;;
-* )
-  distro="$os"
-  distro_version="$(uname -r)"
-  ;;
-esac
-
-slug() {
-  printf '%s' "$1" |
-    tr '[:upper:] ' '[:lower:]-' |
-    tr -cd 'a-z0-9._-'
-}
-
-distro="$(slug "$distro")"
-distro_version="$(slug "$distro_version")"
-arch="$(slug "$arch")"
-
-if [ -z "$distro" ] || [ -z "$distro_version" ] || [ -z "$arch" ]; then
-  echo "pyenv-binary: could not determine the package platform" >&2
-  exit 1
-fi
-
-printf '%s-%s-%s-%s\n' "$version" "$distro" "$distro_version" "$arch"
--- a/plugins/pyenv-binary/libexec/pyenv-binary-relocate
+++ b/plugins/pyenv-binary/libexec/pyenv-binary-relocate
@ -1,137 +0,0 @@
-#!/usr/bin/env bash
-#
-# Summary: Rewrite an unpacked Python's library paths so it runs from its prefix
-#
-# Usage: pyenv binary relocate <prefix> [<build-prefix>]
-#
-#   Rewrites the library paths of a Python tree that was unpacked into <prefix>
-#   so the interpreter and its extension modules load the bundled libraries from
-#   their new location rather than the path it was built at. Requires patchelf on
-#   Linux and FreeBSD, or otool and install_name_tool on macOS.
-#
-#   The definition that `pyenv binary generate-installer' produces calls this
-#   after `install_package ... copy' has laid the tree down.
-#
-set -e
-[ -n "$PYENV_DEBUG" ] && set -x
-
-if [ "$1" = "--complete" ]; then
-  exit
-fi
-
-prefix="$1"
-if [ -z "$prefix" ]; then
-  pyenv-help --usage binary-relocate >&2
-  exit 1
-fi
-
-if [ "$(uname -s)" = "Darwin" ]; then
-  build_prefix="${2%/}"
-  if [ -z "$build_prefix" ]; then
-    echo "pyenv-binary: need the original build prefix to relocate a macOS binary" >&2
-    exit 1
-  fi
-  for tool in otool install_name_tool; do
-    if ! command -v "$tool" >/dev/null 2>&1; then
-      echo "pyenv-binary: need ${tool} to relocate the binary" >&2
-      exit 1
-    fi
-  done
-
-  relocate_macho() {
-    local file="$1" new_rpath="$2"
-    local load_commands install_ids rpaths dependency install_id rpath replacement
-
-    load_commands="$(otool -L "$file")"
-    install_ids="$(otool -D "$file" 2>/dev/null || true)"
-    rpaths="$(otool -l "$file")"
-    install_id="$(printf '%s\n' "$install_ids" | sed -n '2s/^[[:space:]]*//p')"
-
-    while IFS= read -r dependency; do
-      case "$dependency" in
-      "$build_prefix"/lib/* )
-        if [ "$dependency" != "$install_id" ]; then
-          replacement="@rpath/${dependency#"$build_prefix"/lib/}"
-          install_name_tool -change "$dependency" "$replacement" "$file"
-        fi
-        ;;
-      esac
-    done < <(printf '%s\n' "$load_commands" | tail -n +2 | sed -E \
-      's/^[[:space:]]*//; s/[[:space:]]+\(compatibility version.*$//')
-
-    case "$install_id" in
-    "$build_prefix"/lib/* )
-      replacement="@rpath/${install_id#"$build_prefix"/lib/}"
-      install_name_tool -id "$replacement" "$file"
-      ;;
-    esac
-
-    while IFS= read -r rpath; do
-      if [ "$rpath" = "$build_prefix/lib" ]; then
-        install_name_tool -rpath "$rpath" "$new_rpath" "$file"
-      fi
-    done < <(printf '%s\n' "$rpaths" | awk '
-      /cmd LC_RPATH/ { found = 1; next }
-      found && /^[[:space:]]*path / {
-        sub(/^[[:space:]]*path /, "")
-        sub(/ \(offset [0-9]+\)$/, "")
-        print
-        found = 0
-      }
-    ')
-  }
-
-  found=0
-  for file in "$prefix"/bin/*; do
-    [[ -f $file && -x $file && ! -L $file ]] || continue
-    otool -L "$file" >/dev/null 2>&1 || continue
-    relocate_macho "$file" '@executable_path/../lib'
-    found=1
-  done
-  if [ "$found" -eq 0 ]; then
-    echo "pyenv-binary: found no interpreter to relocate under \`${prefix}/bin'" >&2
-    exit 1
-  fi
-
-  for file in "$prefix"/lib/*.dylib; do
-    [[ -f $file && ! -L $file ]] || continue
-    relocate_macho "$file" '@loader_path'
-  done
-  while IFS= read -r so; do
-    relocate_macho "$so" '@loader_path/../..'
-  done < <(find "$prefix" -type f -path '*/lib/python*/lib-dynload/*.so')
-  exit
-fi
-
-# patchelf can add an rpath and write one of any length; chrpath can only shorten
-# an existing one, which is not enough to relocate every build, so require it.
-if ! command -v patchelf >/dev/null 2>&1; then
-  echo "pyenv-binary: need patchelf to relocate the binary" >&2
-  exit 1
-fi
-
-# The interpreter loads libpython from ../lib. Patch every ELF binary in bin/ so
-# this holds whatever the interpreter is named (python3, python2.7, ...); the
-# scripts alongside it (pip, idle) are not ELF, so `--print-rpath' fails on them
-# and they are skipped. A tree with no interpreter at all did not unpack the way
-# we expect, so treat that as an error rather than quietly relocating nothing.
-found=0
-for file in "$prefix"/bin/*; do
-  [[ -f $file && -x $file && ! -L $file ]] || continue
-  patchelf --print-rpath "$file" >/dev/null 2>&1 || continue
-  patchelf --set-rpath "$prefix/lib" "$file"
-  found=1
-done
-if [ "$found" -eq 0 ]; then
-  echo "pyenv-binary: found no interpreter to relocate under \`${prefix}/bin'" >&2
-  exit 1
-fi
-
-# The extension modules CPython built are the only other objects with an rpath
-# into the old prefix, so point them at lib/ as well. Anything a wheel installed
-# carries an rpath of its own, often into a bundled library directory beside it,
-# and would stop loading if we overwrote it. Each match is an ELF object we expect
-# to patch, so let a failure stop us rather than swallow it.
-while IFS= read -r so; do
-  patchelf --set-rpath "$prefix/lib" "$so"
-done < <(find "$prefix" -path '*/lib-dynload/*.so')
--- a/plugins/pyenv-binary/libexec/pyenv-binary-save
+++ b/plugins/pyenv-binary/libexec/pyenv-binary-save
@ -1,157 +0,0 @@
-#!/usr/bin/env bash
-#
-# Summary: Save an installed Python version as a relocatable archive
-#
-# Usage: pyenv binary save <version> [<output-dir>] [--name <name>]
-#
-#   Packs an installed version into a relocatable .tar.gz (relative paths) and
-#   writes a metadata file listing the build platform and the system libraries
-#   it links against, so an installer can check compatibility before unpacking.
-#
-#   <version>      An installed version, as listed by `pyenv versions --bare'.
-#   <output-dir>   Where to write the archive and metadata (default: `.').
-#   --name <name>  Use <name> as the archive and metadata base name instead of
-#                  <version>-<platform>.
-#
-set -e
-[ -n "$PYENV_DEBUG" ] && set -x
-
-# Provide pyenv completions
-if [ "$1" = "--complete" ]; then
-  echo --name
-  exec pyenv-versions --bare
-fi
-
-version=""
-output_dir=""
-package_name=""
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-  --name )
-    [ $# -ge 2 ] && [ -n "$2" ] || { echo "pyenv-binary: --name needs a value" >&2; exit 1; }
-    package_name="$2"; shift 2 ;;
-  -* )
-    echo "pyenv-binary: unknown option \`$1'" >&2; exit 1 ;;
-  * )
-    if [ -z "$version" ]; then
-      version="$1"
-    elif [ -z "$output_dir" ]; then
-      output_dir="$1"
-    else
-      echo "pyenv-binary: unexpected argument \`$1'" >&2
-      exit 1
-    fi
-    shift ;;
-  esac
-done
-
-output_dir="${output_dir:-$PWD}"
-
-if [ -z "$version" ]; then
-  echo "Usage: pyenv binary save <version> [<output-dir>] [--name <name>]" >&2
-  exit 1
-fi
-
-# A version is a single directory name under versions/. With no slash allowed,
-# the only remaining names that could point elsewhere are `.' and `..'.
-case "$version" in
-*/* | .. | . )
-  echo "pyenv-binary: invalid version name \`${version}'" >&2
-  exit 1
-  ;;
-esac
-
-case "$package_name" in
-*/* | .. | . | *[[:cntrl:]]* )
-  echo "pyenv-binary: invalid package name \`${package_name}'" >&2
-  exit 1
-  ;;
-esac
-
-prefix="${PYENV_ROOT}/versions/${version}"
-if [ ! -d "${prefix}/bin" ]; then
-  echo "pyenv-binary: version \`${version}' is not installed" >&2
-  exit 1
-fi
-
-os="$(uname -s)"
-arch="$(uname -m)"
-platform="$(printf '%s' "$os" | tr '[:upper:]' '[:lower:]')-${arch}"
-
-# Record the distro and libc version. Platform and arch alone are too coarse to
-# judge compatibility: a build is only portable to a matching libc (e.g. a
-# glibc 2.36 build will not load on an older glibc, nor on musl at all).
-distro=""
-libc=""
-if [ -r /etc/os-release ]; then
-  distro="$( . /etc/os-release && printf '%s %s' "${ID:-}" "${VERSION_ID:-}" )"
-elif [ "$os" = "Darwin" ]; then
-  distro="macos $(sw_vers -productVersion 2>/dev/null)"
-fi
-if [ "$os" = "Linux" ]; then
-  libc="$(getconf GNU_LIBC_VERSION 2>/dev/null || true)"
-fi
-if [ "$os" != "Darwin" ] && ! LC_ALL=C readelf --version &>/dev/null; then
-  echo "pyenv-binary: need readelf to inspect shared libraries" >&2
-  exit 1
-fi
-
-# List the external shared libraries the install links against: those that
-# resolve outside its own prefix, so they must already exist on the target.
-# The interpreter plus every bundled shared object are inspected.
-system_deps() {
-  local f needed
-  {
-    for f in "${prefix}"/bin/python*; do
-      [ -e "$f" ] && printf '%s\n' "$f"
-    done
-    # CPython ships its extension modules as *.so (and *.dylib on macOS). A
-    # bare *.so.* is unusual for CPython itself, but the odd build carries a
-    # versioned copy alongside, so match it too rather than miss a dependency.
-    find "${prefix}" -type f \( -name '*.so' -o -name '*.so.*' -o -name '*.dylib' \)
-  } | sort -u | while IFS= read -r f; do
-    if [ "$os" = "Darwin" ]; then
-      otool -L "$f" 2>/dev/null | tail -n +2 | awk -v pfx="${prefix}/" \
-        '$1 !~ /^@/ && substr($1, 1, length(pfx)) != pfx { print $1 }'
-    else
-      # GNU binutils 2.44 writes "(NEEDED) ... [name]"; FreeBSD 15.1 writes
-      # "NEEDED ... [name]". readelf(1) documents -d, not its text format.
-      needed="$(LC_ALL=C readelf -dW "$f" 2>/dev/null | awk \
-        '$2 == "(NEEDED)" || $2 == "NEEDED" { sub(/^.*\[/, ""); sub(/\].*$/, ""); print }' | tr '\n' ' ')"
-      # Linux and FreeBSD ldd write resolved libraries as
-      # "name => /absolute/path (address)"; entries without "=>" are ignored.
-      LC_ALL=C ldd "$f" 2>/dev/null | awk -v needed="$needed" -v pfx="${prefix}/" '
-        BEGIN {
-          split(needed, deps, " ")
-          for (i in deps) direct[deps[i]] = 1
-        }
-        $1 in direct && $2 == "=>" && $3 ~ /^\// && substr($3, 1, length(pfx)) != pfx { print $1 }
-      '
-    fi
-  done | sort -u
-}
-
-mkdir -p "$output_dir"
-package_name="${package_name:-${version}-${platform}}"
-archive="${package_name}.tar.gz"
-metadata="${package_name}.meta"
-
-tar -C "$(dirname "$prefix")" -czf "${output_dir}/${archive}" "$(basename "$prefix")"
-
-{
-  echo "# pyenv-binary metadata"
-  echo "version=${version}"
-  echo "os=${os}"
-  echo "arch=${arch}"
-  echo "platform=${platform}"
-  [ -n "$distro" ] && echo "distro=${distro}"
-  [ -n "$libc" ] && echo "libc=${libc}"
-  echo "build_prefix=${prefix}"
-  echo "archive=${archive}"
-  system_deps | while IFS= read -r dep; do
-    [ -n "$dep" ] && echo "dep=${dep}"
-  done
-} > "${output_dir}/${metadata}"
-
-echo "Saved ${archive} and ${metadata} to ${output_dir}"
--- a/plugins/pyenv-binary/test/generate-installer.bats
+++ b/plugins/pyenv-binary/test/generate-installer.bats
@ -1,212 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-create_meta() {
-  local os="${1-Linux}"
-  local arch="${2-x86_64}"
-  local libc="${3-glibc 2.17}"
-  local build_prefix="${4-}"
-  local archive="${BATS_TEST_TMPDIR}/3.12.7.tar.gz"
-  local meta="${BATS_TEST_TMPDIR}/sample.meta"
-
-  rm -rf "${BATS_TEST_TMPDIR}/archive"
-  mkdir -p "${BATS_TEST_TMPDIR}/archive/3.12.7/bin"
-  printf '#!/bin/sh\n' > "${BATS_TEST_TMPDIR}/archive/3.12.7/bin/python"
-  chmod +x "${BATS_TEST_TMPDIR}/archive/3.12.7/bin/python"
-  tar -C "${BATS_TEST_TMPDIR}/archive" -czf "$archive" 3.12.7
-
-  {
-    echo "version=3.12.7"
-    echo "os=${os}"
-    echo "arch=${arch}"
-    [ -z "$libc" ] || echo "libc=${libc}"
-    [ -z "$build_prefix" ] || echo "build_prefix=${build_prefix}"
-    echo "archive=${archive##*/}"
-  } > "$meta"
-  echo "$meta"
-}
-
-@test "completion lists the options" {
-  run pyenv-binary-generate-installer --complete
-  assert_success "--archive-url
-o"
-}
-
-@test "fails with no arguments" {
-  create_stub pyenv-help "echo usage"
-  run pyenv-binary-generate-installer
-  assert_failure "usage"
-}
-
-@test "fails without an archive url" {
-  create_stub pyenv-help "echo usage"
-  run pyenv-binary-generate-installer "$(create_meta)"
-  assert_failure "usage"
-}
-
-@test "fails when --archive-url has no value" {
-  run pyenv-binary-generate-installer "$(create_meta)" --archive-url
-  assert_failure "pyenv-binary: --archive-url needs a value"
-}
-
-@test "rejects a second positional argument" {
-  run pyenv-binary-generate-installer "$(create_meta)" extra --archive-url http://x/a.tar.gz
-  assert_failure "pyenv-binary: unexpected argument \`extra'"
-}
-
-@test "fails for a metadata file that cannot be read" {
-  run pyenv-binary-generate-installer /no/such.meta --archive-url http://x/a.tar.gz
-  assert_failure
-}
-
-@test "fails when macOS metadata is missing the build prefix" {
-  run pyenv-binary-generate-installer "$(create_meta Darwin arm64 '')" \
-    --archive-url http://x/a.tar.gz
-  assert_failure "pyenv-binary: metadata is missing \`build_prefix'"
-}
-
-@test "quotes the macOS build prefix in the generated definition" {
-  local out="${BATS_TEST_TMPDIR}/definition"
-  pyenv-binary-generate-installer \
-    "$(create_meta Darwin arm64 '' '/build prefix/$name')" \
-    --archive-url http://example.com/a.tar.gz -o "$out"
-
-  run grep '^BUILD_PREFIX=' "$out"
-  assert_success 'BUILD_PREFIX=/build\ prefix/\$name'
-}
-
-@test "fails when required metadata is missing" {
-  local field meta
-  for field in version os arch archive; do
-    meta="$(create_meta)"
-    #cannot use -i: GNU sed requires -i[suf], BSD sed required -i <suf>
-    sed "/^${field}=/d" "$meta" > "${meta}.tmp"; mv "${meta}"{.tmp,}
-
-    run pyenv-binary-generate-installer "$meta" --archive-url http://x/a.tar.gz
-    assert_failure "pyenv-binary: metadata is missing \`${field}'"
-  done
-}
-
-@test "fails when Linux metadata is missing libc" {
-  run pyenv-binary-generate-installer "$(create_meta Linux x86_64 '')" \
-    --archive-url http://x/a.tar.gz
-  assert_failure "pyenv-binary: metadata is missing \`libc'"
-}
-
-@test "refuses a host whose glibc is older than the archive" {
-  local out="${BATS_TEST_TMPDIR}/definition"
-  pyenv-binary-generate-installer "$(create_meta Linux x86_64 'glibc 99.0')" \
-    --archive-url http://example.com/a.tar.gz -o "$out"
-  create_stub uname 'case "$1" in -s) echo Linux;; -m) echo x86_64;; esac'
-  create_stub getconf 'echo "glibc 2.31"'
-
-  run bash "$out"
-  assert_failure "pyenv-binary: archive needs glibc 99.0 or newer, but this system has 2.31"
-}
-
-@test "checks required libraries in the FreeBSD ldconfig cache" {
-  local out="${BATS_TEST_TMPDIR}/definition"
-  local meta="$(create_meta FreeBSD amd64 '')"
-  printf 'dep=libc.so.7\ndep=libmissing.so.1\n' >> "$meta"
-  pyenv-binary-generate-installer "$meta" \
-    --archive-url http://example.com/a.tar.gz -o "$out"
-  create_stub uname 'case "$1" in -s) echo FreeBSD;; -m) echo amd64;; esac'
-  create_stub ldconfig '[ "$1" = "-r" ] && echo "0:-lc.7=>/lib/libc.so.7"'
-
-  run bash "$out"
-  assert_failure "pyenv-binary: missing required system libraries: libmissing.so.1"
-}
-
-@test "checks for patchelf before installing the archive" {
-  local out="${BATS_TEST_TMPDIR}/definition"
-  pyenv-binary-generate-installer "$(create_meta)" \
-    --archive-url http://example.com/a.tar.gz -o "$out"
-  create_stub uname 'case "$1" in -s) echo Linux;; -m) echo x86_64;; esac'
-  create_stub getconf 'echo "glibc 2.31"'
-
-  PATH="$(path_without patchelf)" run bash "$out"
-  assert_failure "pyenv-binary: need patchelf to relocate the binary"
-}
-
-@test "checks for otool before installing a macOS archive" {
-  local out="${BATS_TEST_TMPDIR}/definition"
-  pyenv-binary-generate-installer \
-    "$(create_meta Darwin arm64 '' /build/3.12.7)" \
-    --archive-url http://example.com/a.tar.gz -o "$out"
-  create_stub uname 'case "$1" in -s) echo Darwin;; -m) echo arm64;; esac'
-  create_path_executable install_name_tool true
-
-  PATH="$(path_without otool)" run bash "$out"
-  assert_failure "pyenv-binary: need otool to relocate the binary"
-}
-
-@test "checks for install_name_tool before installing a macOS archive" {
-  local out="${BATS_TEST_TMPDIR}/definition"
-  pyenv-binary-generate-installer \
-    "$(create_meta Darwin arm64 '' /build/3.12.7)" \
-    --archive-url http://example.com/a.tar.gz -o "$out"
-  create_stub uname 'case "$1" in -s) echo Darwin;; -m) echo arm64;; esac'
-  create_path_executable otool true
-
-  PATH="$(path_without install_name_tool)" run bash "$out"
-  assert_failure "pyenv-binary: need install_name_tool to relocate the binary"
-}
-
-@test "the generated macOS definition preserves both relocation arguments" {
-  local archive="${BATS_TEST_TMPDIR}/3.12.7.tar.gz"
-  local cache="${BATS_TEST_TMPDIR}/cache"
-  local definition="${BATS_TEST_TMPDIR}/definition"
-  local prefix="${BATS_TEST_TMPDIR}/install"
-  pyenv-binary-generate-installer \
-    "$(create_meta Darwin arm64 '' '/build prefix/$name')" \
-    --archive-url http://example.com/3.12.7.tar.gz -o "$definition"
-  mkdir -p "$cache"
-  cp "$archive" "${cache}/Python-3.12.7-binary.tar.gz"
-  create_stub pyenv 'printf "argc=%s\narg1=%s\narg2=%s\narg3=%s\narg4=%s\n" "$#" "$1" "$2" "$3" "$4"'
-  create_stub uname 'case "$1" in -s) echo Darwin;; -m) echo arm64;; esac'
-  create_stub sw_vers 'echo 15.5'
-  create_stub ldconfig true
-  create_path_executable otool true
-  create_path_executable install_name_tool true
-
-  PYTHON_BUILD_CACHE_PATH="$cache" run \
-    "${BATS_TEST_DIRNAME}/../../python-build/bin/python-build" "$definition" "$prefix"
-  assert_success
-  assert_line "argc=4"
-  assert_line "arg1=binary"
-  assert_line "arg2=relocate"
-  assert_line "arg3=${prefix}"
-  assert_line 'arg4=/build prefix/$name'
-  assert_line "Installed Python-3.12.7-binary to ${prefix}"
-}
-
-@test "fails when the archive is not beside the metadata" {
-  local meta="$(create_meta)"
-  rm "${BATS_TEST_TMPDIR}/3.12.7.tar.gz"
-
-  run pyenv-binary-generate-installer "$meta" --archive-url http://x/a.tar.gz
-  assert_failure "pyenv-binary: cannot read the archive \`${BATS_TEST_TMPDIR}/3.12.7.tar.gz' to checksum it"
-}
-
-@test "the generated definition is installable with python-build" {
-  ldconfig -p &>/dev/null || skip "ldconfig with -p is not present"
-  local archive="${BATS_TEST_TMPDIR}/3.12.7.tar.gz"
-  local cache="${BATS_TEST_TMPDIR}/cache"
-  local definition="${BATS_TEST_TMPDIR}/definition"
-  local prefix="${BATS_TEST_TMPDIR}/install"
-  pyenv-binary-generate-installer "$(create_meta)" \
-    --archive-url http://example.com/3.12.7.tar.gz -o "$definition"
-  mkdir -p "$cache"
-  cp "$archive" "${cache}/Python-3.12.7-binary.tar.gz"
-  create_stub pyenv 'echo "pyenv $*"'
-  create_path_executable patchelf "exit 0"
-  create_stub uname 'case "$1" in -s) echo Linux;; -m) echo x86_64;; esac'
-
-  PYTHON_BUILD_CACHE_PATH="$cache" run \
-    "${BATS_TEST_DIRNAME}/../../python-build/bin/python-build" "$definition" "$prefix"
-  assert_success
-  assert_line "pyenv binary relocate ${prefix}"
-  assert_line "Installed Python-3.12.7-binary to ${prefix}"
-  assert [ -x "${prefix}/bin/python" ]
-}
--- a/plugins/pyenv-binary/test/package-name.bats
+++ b/plugins/pyenv-binary/test/package-name.bats
@ -1,59 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-_setup() {
-  create_stub pyenv-latest '[ "$1" = "-f" ] && [ "$2" = "-k" ] && shift 2 && echo "$*"'
-}
-
-@test "completion lists installable versions" {
-  create_stub pyenv-install \
-    '[ "$*" = "--list --bare" ] && echo 3.13.14'
-
-  run pyenv-binary-package-name --complete
-  assert_success "3.13.14"
-}
-
-@test "fails without a version" {
-  create_stub pyenv-help 'echo usage'
-
-  run pyenv-binary-package-name
-  assert_failure "usage"
-}
-
-@test "rejects a second argument" {
-  create_stub pyenv-help 'echo usage'
-
-  run pyenv-binary-package-name 3.13.14 extra
-  assert_failure "usage"
-}
-
-@test "generates a package name for Linux" {
-  create_stub uname 'case "$1" in -s) echo Linux;; -m) echo x86_64;; esac'
-  create_stub lsb_release 'case "$1" in -si) echo Debian;; -sr) echo 12;; esac'
-
-  run pyenv-binary-package-name 3.13.14
-  assert_success "3.13.14-debian-12-x86_64"
-}
-
-@test "generates a package name for macOS" {
-  create_stub uname 'case "$1" in -s) echo Darwin;; -m) echo arm64;; esac'
-  create_stub sw_vers 'echo 15.5'
-
-  run pyenv-binary-package-name 3.13.14
-  assert_success "3.13.14-macos-15.5-arm64"
-}
-
-@test "resolves a version prefix when generating a package name" {
-  create_stub pyenv-latest '[ "$*" = "-f -k 3" ] && echo 3.14.7'
-  create_stub uname \
-    'case "$1" in -s) echo FreeBSD;; -m) echo amd64;; -r) echo 14.2-RELEASE-p3;; esac'
-
-  run pyenv-binary-package-name 3
-  assert_success "3.14.7-freebsd-14.2-release-p3-amd64"
-}
-
-@test "rejects an invalid version name" {
-  run pyenv-binary-package-name ../3.13.14
-  assert_failure "pyenv-binary: invalid version name \`../3.13.14'"
-}
--- a/plugins/pyenv-binary/test/package.bats
+++ b/plugins/pyenv-binary/test/package.bats
@ -1,131 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-# Make the build deterministic: `pyenv-install' just creates the prefix, and
-# the platform tools report a fixed Linux target so the real `save' and
-# `generate-installer' behave the same on any test host.
-stub_build_environment() {
-  create_stub pyenv-install 'echo "${0##*/} $*"; mkdir -p "${PYENV_ROOT}/versions/${1##*:}/bin"'
-  create_stub pyenv-latest 'while (($#)); do case "$1" in -f|-k);; *)break;; esac; shift; done; echo "$*"'
-  create_stub uname 'case "$1" in -s) echo Linux;; -m) echo x86_64;; esac'
-  create_stub getconf 'echo "glibc 2.17"'
-  create_stub readelf true
-}
-
-@test "-v|--verbose runs pyenv install verbosely" {
-  stub_build_environment
-  create_stub pyenv-binary-save true
-  create_stub pyenv-binary-generate-installer true
-
-  for opt in "" -v --verbose; do 
-    run pyenv-binary-package $opt 3.12.7:3.12.7-test \
-      --archive-base-url http://example.com/binaries
-    assert_success "pyenv-install ${opt:+--verbose }3.12.7:3.12.7-test"
-  done
-}
-
-@test "completions" {
-  create_stub pyenv-install 'echo "${0##*/} $*"'
-
-  run pyenv-binary-package --complete
-  assert_success <<!
--archive-base-url
--verbose
-pyenv-install --list --bare
-!
-}
-
-@test "fails with no arguments" {
-  create_stub pyenv-help "echo usage"
-  run pyenv-binary-package
-  assert_failure "usage"
-}
-
-@test "fails without an archive base url" {
-  create_stub pyenv-help "echo usage"
-  run pyenv-binary-package 3.12.7:3.12.7-test
-  assert_failure "usage"
-}
-
-@test "fails when --archive-base-url has no value" {
-  run pyenv-binary-package 3.12.7:3.12.7-test --archive-base-url
-  assert_failure "pyenv-binary: --archive-base-url needs a value"
-}
-
-@test "rejects a second positional argument" {
-  run pyenv-binary-package 3.12.7:3.12.7-test extra --archive-base-url http://x/b
-  assert_failure "pyenv-binary: unexpected argument \`extra'"
-}
-
-@test "generates an entry name for a bare version" {
-  stub_build_environment
-  create_stub lsb_release 'case "$1" in -si) echo Debian;; -sr) echo 12;; esac'
-  cd "${BATS_TEST_TMPDIR}"
-
-  run pyenv-binary-package 3.12.7 --archive-base-url http://example.com/binaries
-  assert_success
-  assert [ -d "${PYENV_ROOT}/versions/3.12.7-debian-12-x86_64" ]
-  assert [ -f "${BATS_TEST_TMPDIR}/3.12.7-debian-12-x86_64.tar.gz" ]
-  assert [ -f "${BATS_TEST_TMPDIR}/3.12.7-debian-12-x86_64.meta" ]
-  run grep '^ARCHIVE_URL=' "${BATS_TEST_TMPDIR}/3.12.7-debian-12-x86_64"
-  assert_success "ARCHIVE_URL=http://example.com/binaries/3.12.7-debian-12-x86_64.tar.gz"
-}
-
-@test "rejects an entry name containing a slash" {
-  run pyenv-binary-package "3.12.7:foo/bar" --archive-base-url http://x/b
-  assert_failure "pyenv-binary: invalid entry name \`foo/bar'"
-}
-
-@test "rejects \`latest' as an entry name" {
-  run pyenv-binary-package 3.12:latest --archive-base-url http://x/b
-  assert_failure "pyenv-binary: \`latest' cannot be used as an entry name"
-}
-
-@test "packages on macOS" {
-  create_stub uname 'case "$1" in -s) echo Darwin;; -m) echo arm64;; esac'
-  create_stub pyenv-install 'echo install'
-  create_stub pyenv-binary-save 'echo save'
-  create_stub pyenv-binary-generate-installer 'echo generate-installer'
-
-  run pyenv-binary-package 3.12.7:3.12.7-test --archive-base-url http://x/b
-  assert_success "install
-save
-generate-installer"
-}
-
-@test "writes the archive, metadata and definition under the entry name (integration)" {
-  stub_build_environment
-  cd "${BATS_TEST_TMPDIR}"
-
-  run pyenv-binary-package 3.12.7:3.12.7-test \
-    --archive-base-url http://example.com/binaries
-  assert_success
-  assert [ -d "${PYENV_ROOT}/versions/3.12.7-test" ]
-  assert [ -f "${BATS_TEST_TMPDIR}/3.12.7-test.tar.gz" ]
-  assert [ -f "${BATS_TEST_TMPDIR}/3.12.7-test.meta" ]
-  run grep '^ARCHIVE_URL=' "${BATS_TEST_TMPDIR}/3.12.7-test"
-  assert_success "ARCHIVE_URL=http://example.com/binaries/3.12.7-test.tar.gz"
-}
-
-@test "correctly joins archive base url with a trailing slash" {
-  stub_build_environment
-  create_stub pyenv-binary-save true
-  create_stub pyenv-binary-generate-installer <<'!'
-echo -n "${0##*/} "
-while (($#)); do
-  case $1 in
-    --archive-url)
-      echo "$1 ${2:?}"
-      break
-      ;;
-  esac
-  shift
-done
-!
-
-  run pyenv-binary-package 3.12.7:3.12.7-test \
-    --archive-base-url http://example.com/binaries/
-  assert_success
-  assert_line "pyenv-binary-generate-installer --archive-url http://example.com/binaries/3.12.7-test.tar.gz"
-}
--- a/plugins/pyenv-binary/test/relocate.bats
+++ b/plugins/pyenv-binary/test/relocate.bats
@ -1,221 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-_setup() {
-  create_stub pyenv-help "echo usage"
-  create_stub uname 'case "$1" in -s) echo Linux;; -m) echo x86_64;; esac'
-}
-
-stub_patchelf() {
-  create_path_executable patchelf <<STUB
-if [ "\$1" = "--print-rpath" ]; then
-  exit 0
-fi
-echo "\$*" >> "${BATS_TEST_TMPDIR}/patchelf.log"
-STUB
-}
-
-create_interpreter() {
-  mkdir -p "${BATS_TEST_TMPDIR}/prefix/bin"
-  printf '#!/bin/sh\n' > "${BATS_TEST_TMPDIR}/prefix/bin/python2.7"
-  chmod +x "${BATS_TEST_TMPDIR}/prefix/bin/python2.7"
-}
-
-create_macos_tree() {
-  local prefix="${BATS_TEST_TMPDIR}/prefix"
-  local lib="${prefix}/lib/python3.12"
-  mkdir -p "${prefix}/bin" "${lib}/lib-dynload" "${lib}/site-packages/numpy"
-  printf '#!/bin/sh\n' > "${prefix}/bin/python3.12"
-  chmod +x "${prefix}/bin/python3.12"
-  touch "${prefix}/lib/libpython3.12.dylib"
-  touch "${lib}/lib-dynload/_ssl.cpython-312-darwin.so"
-  touch "${lib}/site-packages/numpy/_multiarray.so"
-}
-
-stub_macos_tools() {
-  create_stub uname 'case "$1" in -s) echo Darwin;; -m) echo arm64;; esac'
-  create_path_executable install_name_tool \
-    'echo "$*" >> "${BATS_TEST_TMPDIR}/install-name-tool.log"'
-  create_path_executable otool <<'STUB'
-file="${!#}"
-echo "$*" >> "${BATS_TEST_TMPDIR}/otool.log"
-old="/build prefix/3.12.7"
-case "$1" in
-L )
-  echo "${file}:"
-  case "$file" in
-  */bin/python3.12 )
-    if [ -n "$OTOOL_RELOCATED" ]; then
-      echo "    @rpath/libpython3.12.dylib (compatibility version 3.12.0, current version 3.12.0)"
-    else
-      echo "    ${old}/lib/libpython3.12.dylib (compatibility version 3.12.0, current version 3.12.0)"
-    fi
-    echo "    ${old}-other/lib/libother.dylib (compatibility version 1.0.0, current version 1.0.0)"
-    echo "    /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1.0.0)"
-    echo "    /opt/homebrew/lib/libintl.8.dylib (compatibility version 1.0.0, current version 1.0.0)"
-    echo "    @loader_path/liblocal.dylib (compatibility version 1.0.0, current version 1.0.0)"
-    ;;
-  */lib/libpython3.12.dylib )
-    if [ -n "$OTOOL_RELOCATED" ]; then
-      echo "    @rpath/libpython3.12.dylib (compatibility version 3.12.0, current version 3.12.0)"
-    else
-      echo "    ${old}/lib/libpython3.12.dylib (compatibility version 3.12.0, current version 3.12.0)"
-    fi
-    ;;
-  esac
-  ;;
-D )
-  case "$file" in
-  */lib/libpython3.12.dylib )
-    echo "${file}:"
-    if [ -n "$OTOOL_RELOCATED" ]; then
-      echo '@rpath/libpython3.12.dylib'
-    else
-      echo "${old}/lib/libpython3.12.dylib"
-    fi
-    ;;
-  * )
-    exit 1
-    ;;
-  esac
-  ;;
-l )
-  if [ -n "$OTOOL_RELOCATED" ]; then
-    case "$file" in
-    */bin/* ) rpath='@executable_path/../lib' ;;
-    */lib/*.dylib ) rpath='@loader_path' ;;
-    * ) rpath='@loader_path/../..' ;;
-    esac
-  else
-    rpath="${old}/lib"
-  fi
-  cat <<EOF
-          cmd LC_RPATH
-         path ${rpath} (offset 12)
-          cmd LC_RPATH
-         path /opt/homebrew/lib (offset 12)
-          cmd LC_RPATH
-         path @loader_path/vendor (offset 12)
-EOF
-  ;;
-esac
-STUB
-}
-
-@test "completion produces nothing" {
-  run pyenv-binary-relocate --complete
-  assert_success ""
-}
-
-@test "fails without a prefix" {
-  run pyenv-binary-relocate
-  assert_failure "usage"
-}
-
-@test "fails when patchelf is not available" {
-  PATH="$(path_without patchelf)" run pyenv-binary-relocate "${BATS_TEST_TMPDIR}/prefix"
-  assert_failure "pyenv-binary: need patchelf to relocate the binary"
-}
-
-@test "fails without the original build prefix on macOS" {
-  create_stub uname 'case "$1" in -s) echo Darwin;; -m) echo arm64;; esac'
-
-  run pyenv-binary-relocate "${BATS_TEST_TMPDIR}/prefix"
-  assert_failure "pyenv-binary: need the original build prefix to relocate a macOS binary"
-}
-
-@test "fails when otool is not available on macOS" {
-  create_stub uname 'case "$1" in -s) echo Darwin;; -m) echo arm64;; esac'
-  create_path_executable install_name_tool true
-
-  PATH="$(path_without otool)" run \
-    pyenv-binary-relocate "${BATS_TEST_TMPDIR}/prefix" /build/3.12.7
-  assert_failure "pyenv-binary: need otool to relocate the binary"
-}
-
-@test "fails when install_name_tool is not available on macOS" {
-  create_stub uname 'case "$1" in -s) echo Darwin;; -m) echo arm64;; esac'
-  create_path_executable otool true
-
-  PATH="$(path_without install_name_tool)" run \
-    pyenv-binary-relocate "${BATS_TEST_TMPDIR}/prefix" /build/3.12.7
-  assert_failure "pyenv-binary: need install_name_tool to relocate the binary"
-}
-
-@test "fails when the prefix has no interpreter" {
-  create_path_executable patchelf "exit 0"
-  mkdir -p "${BATS_TEST_TMPDIR}/prefix"
-
-  run pyenv-binary-relocate "${BATS_TEST_TMPDIR}/prefix"
-  assert_failure "pyenv-binary: found no interpreter to relocate under \`${BATS_TEST_TMPDIR}/prefix/bin'"
-}
-
-@test "relocates an executable interpreter" {
-  stub_patchelf
-  create_interpreter
-
-  run pyenv-binary-relocate "${BATS_TEST_TMPDIR}/prefix"
-  assert_success
-  run cat "${BATS_TEST_TMPDIR}/patchelf.log"
-  assert_output "--set-rpath ${BATS_TEST_TMPDIR}/prefix/lib ${BATS_TEST_TMPDIR}/prefix/bin/python2.7"
-}
-
-@test "relocates the extension modules but not what a wheel installed" {
-  local lib="${BATS_TEST_TMPDIR}/prefix/lib/python3.12"
-  stub_patchelf
-  create_interpreter
-  mkdir -p "${lib}/lib-dynload" "${lib}/site-packages/numpy"
-  touch "${lib}/lib-dynload/_ssl.cpython-312-x86_64-linux-gnu.so"
-  # A wheel points its extensions at the libraries it bundles alongside them, so
-  # its rpath is its own business and must survive relocation.
-  touch "${lib}/site-packages/numpy/_multiarray.so"
-
-  run pyenv-binary-relocate "${BATS_TEST_TMPDIR}/prefix"
-  assert_success
-  run cat "${BATS_TEST_TMPDIR}/patchelf.log"
-  assert_line "--set-rpath ${BATS_TEST_TMPDIR}/prefix/lib ${lib}/lib-dynload/_ssl.cpython-312-x86_64-linux-gnu.so"
-  refute_line "--set-rpath ${BATS_TEST_TMPDIR}/prefix/lib ${lib}/site-packages/numpy/_multiarray.so"
-}
-
-@test "relocates macOS load commands without changing unrelated entries" {
-  local prefix="${BATS_TEST_TMPDIR}/prefix"
-  local old="/build prefix/3.12.7"
-  local lib="${prefix}/lib/python3.12"
-  create_macos_tree
-  stub_macos_tools
-
-  run pyenv-binary-relocate "$prefix" "$old"
-  assert_success
-  run cat "${BATS_TEST_TMPDIR}/install-name-tool.log"
-  assert_output <<EOF
-change ${old}/lib/libpython3.12.dylib @rpath/libpython3.12.dylib ${prefix}/bin/python3.12
-rpath ${old}/lib @executable_path/../lib ${prefix}/bin/python3.12
-id @rpath/libpython3.12.dylib ${prefix}/lib/libpython3.12.dylib
-rpath ${old}/lib @loader_path ${prefix}/lib/libpython3.12.dylib
-rpath ${old}/lib @loader_path/../.. ${lib}/lib-dynload/_ssl.cpython-312-darwin.so
-EOF
-  run grep -F "${lib}/site-packages/numpy/_multiarray.so" "${BATS_TEST_TMPDIR}/otool.log"
-  assert_failure
-}
-
-@test "skips already relocated macOS load commands" {
-  local prefix="${BATS_TEST_TMPDIR}/prefix"
-  create_macos_tree
-  stub_macos_tools
-  export OTOOL_RELOCATED=1
-
-  run pyenv-binary-relocate "$prefix" "/build prefix/3.12.7"
-  assert_success
-  assert [ ! -e "${BATS_TEST_TMPDIR}/install-name-tool.log" ]
-}
-
-@test "fails when install_name_tool cannot modify a selected file" {
-  local prefix="${BATS_TEST_TMPDIR}/prefix"
-  create_macos_tree
-  stub_macos_tools
-  create_path_executable install_name_tool 'exit 1'
-
-  run pyenv-binary-relocate "$prefix" "/build prefix/3.12.7"
-  assert_failure ""
-}
--- a/plugins/pyenv-binary/test/save.bats
+++ b/plugins/pyenv-binary/test/save.bats
@ -1,155 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-create_version() {
-  mkdir -p "${PYENV_ROOT}/versions/$1/bin"
-}
-
-platform() {
-  echo "$(uname -s | tr '[:upper:]' '[:lower:]')-$(uname -m)"
-}
-
-@test "fails with no version given" {
-  run pyenv-binary-save
-  assert_failure "Usage: pyenv binary save <version> [<output-dir>] [--name <name>]"
-}
-
-@test "fails for a version that is not installed" {
-  run pyenv-binary-save 9.9.9
-  assert_failure "pyenv-binary: version \`9.9.9' is not installed"
-}
-
-@test "rejects a version name containing a slash" {
-  run pyenv-binary-save "foo/bar"
-  assert_failure "pyenv-binary: invalid version name \`foo/bar'"
-}
-
-@test "rejects the parent directory reference" {
-  run pyenv-binary-save ".."
-  assert_failure "pyenv-binary: invalid version name \`..'"
-}
-
-@test "packages an installed version" {
-  create_version "3.12.7"
-  local out="${BATS_TEST_TMPDIR}/dist"
-  local archive="${out}/3.12.7-$(platform).tar.gz"
-
-  run pyenv-binary-save "3.12.7" "$out"
-  assert_success "Saved 3.12.7-$(platform).tar.gz and 3.12.7-$(platform).meta to $out"
-  assert [ -f "$archive" ]
-  assert [ -f "${out}/3.12.7-$(platform).meta" ]
-  run tar -tzf "$archive"
-  assert_success
-  assert_line 0 "3.12.7/"
-}
-
-@test "uses an explicit package name" {
-  create_version "3.12.7"
-  local out="${BATS_TEST_TMPDIR}/dist"
-
-  run pyenv-binary-save "3.12.7" "$out" --name "custom"
-  assert_success "Saved custom.tar.gz and custom.meta to $out"
-  assert [ -f "${out}/custom.tar.gz" ]
-  run grep '^archive=' "${out}/custom.meta"
-  assert_success "archive=custom.tar.gz"
-}
-
-@test "fails when --name has no value" {
-  run pyenv-binary-save "3.12.7" --name
-  assert_failure "pyenv-binary: --name needs a value"
-}
-
-@test "rejects an invalid package name" {
-  create_version "3.12.7"
-
-  run pyenv-binary-save "3.12.7" --name "foo/bar"
-  assert_failure "pyenv-binary: invalid package name \`foo/bar'"
-}
-
-@test "records the platform in the metadata" {
-  create_version "3.12.7"
-  local out="${BATS_TEST_TMPDIR}/dist"
-  pyenv-binary-save "3.12.7" "$out" >/dev/null
-
-  run cat "${out}/3.12.7-$(platform).meta"
-  assert_success
-  assert_line "version=3.12.7"
-  assert_line "platform=$(platform)"
-  assert_line "archive=3.12.7-$(platform).tar.gz"
-}
-
-@test "records the original installation prefix" {
-  create_version "3.12.7"
-  local out="${BATS_TEST_TMPDIR}/dist"
-  pyenv-binary-save "3.12.7" "$out" >/dev/null
-
-  run grep '^build_prefix=' "${out}/3.12.7-$(platform).meta"
-  assert_success "build_prefix=${PYENV_ROOT}/versions/3.12.7"
-}
-
-@test "fails when readelf is not available" {
-  create_version "3.12.7"
-  create_stub uname 'case "$1" in -s) echo Linux;; -m) echo x86_64;; esac'
-
-  PATH="$(path_without readelf)" run pyenv-binary-save "3.12.7" "${BATS_TEST_TMPDIR}/dist"
-  assert_failure "pyenv-binary: need readelf to inspect shared libraries"
-  assert [ ! -e "${BATS_TEST_TMPDIR}/dist/3.12.7-$(platform).tar.gz" ]
-}
-
-@test "records only direct libraries resolved outside the prefix" {
-  create_version "3.12.7"
-  touch "${PYENV_ROOT}/versions/3.12.7/bin/python3.12"
-  create_path_executable uname <<'STUB'
-case "$1" in
-  -s) echo Linux ;;
-  -m) echo x86_64 ;;
-esac
-STUB
-  create_path_executable ldd <<'STUB'
-prefix="${PYENV_ROOT}/versions/3.12.7"
-cat <<EOF
-	linux-vdso.so.1 (0x00007ffd1adfe000)
-	libpython3.12.so.1.0 => ${prefix}/lib/libpython3.12.so.1.0 (0x00007f4a3c000000)
-	libm.so.6 => /lib/x86_64-linux-gnu/libm.so.6 (0x00007f4a3bc00000)
-	libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f4a3b800000)
-	/lib64/ld-linux-x86-64.so.2 (0x00007f4a3c200000)
-EOF
-STUB
-  create_path_executable readelf <<'STUB'
-cat <<EOF
- 0x0000000000000001 (NEEDED)             Shared library: [libpython3.12.so.1.0]
- 0x0000000000000001 (NEEDED)             Shared library: [libm.so.6]
-EOF
-STUB
-
-  run pyenv-binary-save "3.12.7" "${BATS_TEST_TMPDIR}/dist"
-  assert_success
-  run grep '^dep=' "${BATS_TEST_TMPDIR}/dist/"*.meta
-  assert_output "dep=libm.so.6"
-}
-
-@test "records only the libraries otool resolves outside the prefix" {
-  create_version "3.12.7"
-  touch "${PYENV_ROOT}/versions/3.12.7/bin/python3.12"
-  create_path_executable uname <<'STUB'
-case "$1" in
-  -s) echo Darwin ;;
-  -m) echo arm64 ;;
-esac
-STUB
-  create_path_executable otool <<'STUB'
-prefix="${PYENV_ROOT}/versions/3.12.7"
-cat <<EOF
-${2}:
-	@rpath/libpython3.12.dylib (compatibility version 3.12.0, current version 3.12.0)
-	${prefix}/lib/libcrypto.3.dylib (compatibility version 3.0.0, current version 3.0.0)
-	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1345.0.0)
-EOF
-STUB
-
-  run pyenv-binary-save "3.12.7" "${BATS_TEST_TMPDIR}/dist"
-  assert_success
-  run grep '^dep=' "${BATS_TEST_TMPDIR}/dist/"*.meta
-  assert_output "dep=/usr/lib/libSystem.B.dylib"
-}
--- a/plugins/pyenv-binary/test/test_helper.bash
+++ b/plugins/pyenv-binary/test/test_helper.bash
@ -1 +0,0 @@
-../../../test/test_helper.bash
--- a/plugins/pyenv-link/LICENSE
+++ b/plugins/pyenv-link/LICENSE
@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 yfprojects
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/plugins/pyenv-link/README.md
+++ b/plugins/pyenv-link/README.md
@ -1,33 +0,0 @@
-# pyenv-link
-A [pyenv](https://github.com/pyenv/pyenv) plugin for linking Python installations and virtual environments into your pyenv root.
-
-This plugin recommends the [pyenv-virtualenv](https://github.com/pyenv/pyenv-virtualenv/) plugin.
-
-## Usage
-
-Make an arbitrary virtualenv available through pyenv. This automatically guesses a fitting name from the prompt, the directory name or the location of the venv.
-
-```console
-$ pyenv link version .venv
-Linked new version named myproject
-```
-
-You can also specify a name to use for the venv.
-
-```console
-$ pyenv link version .venv myname
-Linked new version named myname
-```
-
-The same command can give a platform-specific binary installation a shorter name:
-
-```console
-$ pyenv link version "$(pyenv root)/versions/3.13.14-linux-x86_64" 3.13.14
-Linked new version named 3.13.14
-```
-
-Now you can make pyenv activate/use the venv automatically:
-
-```console
-$ pyenv local myproject
-```
--- a/plugins/pyenv-link/bin/pyenv-link
+++ b/plugins/pyenv-link/bin/pyenv-link
@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-#
-# Summary: Link a Python environment as a pyenv version
-#
-# Usage: pyenv link version [--dry] [--quiet] <path> [<name>]
-#
-# Link a virtual python environment to pyenvs version directory
-# so that the venv can be used like one created with *pyenv-virtualenv*.
-#
-# <path> should be a path to a Python installation or virtual environment.
-
-set -e
-[ -n "$PYENV_DEBUG" ] && set -x
-
-# Provide pyenv completions
-case "$1" in
--complete)
-    if [ -z "$2" ]; then
-        echo version
-    else
-        shift 2
-        pyenv-link-version --complete "$@"
-    fi
-    ;;
-version)
-    shift
-    pyenv-link-version "$@"
-    exit $?
-    ;;
-*)
-    pyenv-help --usage link >&2
-    exit 1
-    ;;
-esac
--- a/plugins/pyenv-link/bin/pyenv-link-version
+++ b/plugins/pyenv-link/bin/pyenv-link-version
@ -1,150 +0,0 @@
-#!/usr/bin/env bash
-#
-# Summary: Link a Python environment as a pyenv version
-#
-# Usage: pyenv link version [--dry] [--quiet] <path> [<name>]
-#
-# Link a virtual python environment to pyenvs version directory
-# so that the venv can be used like one created with *pyenv-virtualenv*.
-#
-# <path> should be a path to a Python installation or virtual environment.
-# <name> should be string used as a version name it may not be present
-#        in the pyenv version directory yet.
-#        If not specified a matching name is guessed from pyvenv.cfg
-#        or directory name of the venv.
-set -e
-[ -n "$PYENV_DEBUG" ] && set -x
-
-# functions
-
-if ! {
-    enable -f "${BASH_SOURCE%/*}"/../../../libexec/pyenv-realpath.dylib realpath ||
-        type realpath # realpath available?
-} >/dev/null 2>&1; then
-    # realpath requires GNU coreutils to be installed. That's why its bundled with pyenv
-    echo realpath not available >&2
-
-    # work-around when realpath is unavailable
-    realpath() {
-        (cd "$1" && pwd)
-    }
-fi
-
-guess_name() {
-    local venv_dir=$1
-    local name
-
-    # guess venv name from pyvenv.cfg
-    local pyvenv_cfg_path=$venv_dir/pyvenv.cfg
-    if [ -f "$pyvenv_cfg_path" ]; then
-        # if `prompt` key wasn't found the var remains empty
-        name=$(cut -b 1-1024 "$pyvenv_cfg_path" | sed -n '/^ *prompt *= */s///p')
-        case "$name" in
-        \"*\" | \'*\')
-            name=${name:1:${#name}-2}
-            ;;
-        esac
-    fi
-
-    # guess venv name from name of venv directory
-    local venv_dir_name=${venv_dir##*/}
-    if [ -z "$name" ]; then
-        case "$venv_dir_name" in
-        venv | env | .venv | .env | ENV | VENV) ;;
-        *) name=$venv_dir_name ;;
-        esac
-    fi
-
-    # guess venv name from name of the parent directory of the venv directory
-    local venv_dir_parent=${venv_dir%/*}
-    local venv_dir_parent_name=${venv_dir_parent##*/}
-    if [ -z "$name" ]; then
-        name=$venv_dir_parent_name
-    fi
-
-    echo "$name"
-}
-
-# process args
-POSARGS=()
-# Provide pyenv completions
-if [ "$1" = "--complete" ]; then
-    echo --dry
-    echo --quiet
-    exit
-fi
-
-for arg in "$@"; do
-    case $arg in
-    --dry)
-        dry=true # any value
-        ;;
-    --quiet)
-        quiet=true # any value
-        ;;
-    -*)
-        pyenv-help --usage link-version >&2
-        exit 1
-        ;;
-    *)
-        POSARGS+=("$arg")
-        ;;
-    esac
-done
-
-if [ ! ${#POSARGS[@]} -le 2 ] || [ ! ${#POSARGS[@]} -ge 1 ]; then
-    pyenv-help --usage link-version >&2
-    exit 1
-fi
-
-venv_dir=${POSARGS[0]%/}
-venv_name=${POSARGS[1]}
-
-# Check venv exists
-if [ ! -d "$venv_dir" ]; then
-    echo "The virtual env you specified doesn't exist"
-    exit 2
-fi
-
-# make venv dir absolute
-venv_dir=$(realpath "$venv_dir")
-
-# determine venv name
-if [ -z "$venv_name" ]; then
-    venv_name=$(guess_name "$venv_dir")
-fi
-
-case "$venv_name" in
-"" | */* | . | .. | *:* | system | *[[:cntrl:]]* )
-    echo "pyenv-link: invalid version name \`${venv_name}'" >&2
-    exit 1
-    ;;
-esac
-
-versions_dir="$PYENV_ROOT/versions"
-pyenv_prefix_path="$versions_dir/$venv_name"
-
-if [ -e "$pyenv_prefix_path" ] || [ -L "$pyenv_prefix_path" ]; then
-    echo Version "$venv_name" already exists >&2
-    exit 3
-fi
-
-case "$venv_dir" in
-"$versions_dir"/*)
-    link_target=${venv_dir#"$versions_dir"/}
-    ;;
-*)
-    link_target=$venv_dir
-    ;;
-esac
-
-# link to pyenv version directory
-if [ -z "$dry" ]; then
-    mkdir -p "$versions_dir"
-    ln -s "$link_target" "$pyenv_prefix_path"
-fi
-
-# output
-if [ -z "$quiet" ]; then
-    echo "Linked new version named $venv_name"
-fi
--- a/plugins/pyenv-link/test/link.bats
+++ b/plugins/pyenv-link/test/link.bats
@ -1,61 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "link completions use the dispatcher" {
-  run pyenv completions link
-  assert_success
-  assert_output <<OUT
--help
-version
-OUT
-  run pyenv completions link version
-  assert_success
-  assert_output <<OUT
--help
--dry
--quiet
-OUT
-}
-
-@test "link requires a version path" {
-  run pyenv-link version
-  assert_failure "Usage: pyenv link version [--dry] [--quiet] <path> [<name>]"
-}
-
-@test "links an installed binary under its plain version name" {
-  create_alt_executable_in_version "3.13.14-linux-x86_64" python 'echo linked-python'
-  run pyenv-link version "$PYENV_ROOT/versions/3.13.14-linux-x86_64" 3.13.14
-  assert_success "Linked new version named 3.13.14"
-  assert_equal "3.13.14-linux-x86_64" "$(readlink "$PYENV_ROOT/versions/3.13.14")"
-  PYENV_VERSION=3.13.14 run pyenv exec python
-  assert_success "linked-python"
-}
-
-@test "links external paths containing spaces into a fresh root" {
-  mkdir -p "$PYENV_TEST_DIR/external env/bin"
-  run pyenv-link version "$PYENV_TEST_DIR/external env" custom
-  assert_success "Linked new version named custom"
-  assert_equal "$PYENV_TEST_DIR/external env" "$(readlink "$PYENV_ROOT/versions/custom")"
-}
-
-@test "refuses a dangling destination link" {
-  mkdir -p "$PYENV_ROOT/versions" "$PYENV_TEST_DIR/source"
-  ln -s missing "$PYENV_ROOT/versions/dangling"
-  run pyenv-link version "$PYENV_TEST_DIR/source" dangling
-  assert_failure "Version dangling already exists"
-  assert_equal missing "$(readlink "$PYENV_ROOT/versions/dangling")"
-}
-
-@test "rejects invalid version names" {
-  mkdir -p "$PYENV_TEST_DIR/source"
-  for name in ../outside . .. 'foo/bar' 'foo:bar' system; do
-    run pyenv-link version "$PYENV_TEST_DIR/source" "$name"
-    assert_failure "pyenv-link: invalid version name \`$name'"
-    assert [ ! -e "$PYENV_ROOT/outside" ]
-  done
-  echo "prompt = '../outside'" > "$PYENV_TEST_DIR/source/pyvenv.cfg"
-  run pyenv-link version "$PYENV_TEST_DIR/source"
-  assert_failure "pyenv-link: invalid version name \`../outside'"
-  assert [ ! -e "$PYENV_ROOT/outside" ]
-}
--- a/plugins/pyenv-link/test/test_helper.bash
+++ b/plugins/pyenv-link/test/test_helper.bash
@ -1 +0,0 @@
-../../../test/test_helper.bash
--- a/plugins/python-build/README.md
+++ b/plugins/python-build/README.md
@ -54,11 +54,8 @@ Or, if you would like to install the latest development release:

 ## Usage

-On Ubuntu, Debian, and Mint, install the recommended build dependencies with:
-
-    pyenv install-prerequisites
-
-For other environments, see our [build environment recommendations](https://github.com/pyenv/pyenv/wiki#suggested-build-environment).
+Before you begin, you should ensure that your build environment has the proper
+system dependencies for compiling the wanted Python Version (see our [recommendations](https://github.com/pyenv/pyenv/wiki#suggested-build-environment)).

 ### Using `pyenv install` with pyenv

@ -70,13 +67,6 @@ exact name of the version you want to install. For example,
 Python versions will be installed into a directory of the same name under
 `~/.pyenv/versions`.

-To install a version under a different name -- for instance, to keep several
-builds of the same version side by side -- append `:<alias>` to the version:
-
-    pyenv install 3.12.0:3.12-custom
-
-This installs into `~/.pyenv/versions/3.12-custom`.
-
 To see a list of all available Python versions, run `pyenv install --list`. You
 may also tab-complete available Python versions if your pyenv installation is
 properly configured.
@ -272,7 +262,7 @@ would be to make symlinks at the mirror's root:
 ```

 The rationale is to abstract away difference between directory structures of sites
-of various Python flavors and their occasional changes as well as to accommodate
+of various Python flavors and their occasional changes as well as to accomodate
 people who only wish to cache some select downloads. This also allows to mirror multiple sites at once.

 If the mirror being used does not have the same checksum (*e.g.* with a
@ -364,3 +354,4 @@ git diff --name-only master \
 - Filter out any which don't live where python-build keeps its build scripts
 - Look only at the file name (i.e. the python version name)
 - Run a new docker container for each, building that version
+
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@ -2,9 +2,9 @@
 #
 # Summary: Install a Python version using python-build
 #
-# Usage: pyenv install [-f] [-kvp] <version>[:<alias>]...
-#        pyenv install [-f] [-kvp] <definition-file>[:<alias>]
-#        pyenv install -l|--list [--bare]
+# Usage: pyenv install [-f] [-kvp] <version>...
+#        pyenv install [-f] [-kvp] <definition-file>
+#        pyenv install -l|--list
 #        pyenv install --version
 #
 #   -l/--list          List all available versions
@ -20,13 +20,6 @@
 #   --version          Show version of python-build
 #   -g/--debug         Build a debug version
 #
-#   Append `:<alias>' to a version to install it under a custom name, so that
-#   several builds of the same version can coexist:
-#
-#       pyenv install 3.12.0:my-3.12
-#
-#   This installs into $PYENV_ROOT/versions/my-3.12.
-#
 # For detailed information on installing Python versions with
 # python-build, including a list of environment variables for adjusting
 # compilation, see: https://github.com/pyenv/pyenv#readme
@ -45,7 +38,6 @@ shopt -u nullglob

 # Provide pyenv completions
 if [ "$1" = "--complete" ]; then
-  echo --bare
  echo --list
  echo --force
  echo --skip-existing
@ -80,8 +72,6 @@ unset KEEP
 unset VERBOSE
 unset HAS_PATCH
 unset DEBUG
-unset BARE
-unset LIST

 [ -n "$PYENV_DEBUG" ] && VERBOSE="-v"

@ -91,11 +81,10 @@ for option in "${OPTIONS[@]}"; do
  "h" | "help" )
    usage 0
    ;;
-  "bare" )
-    BARE=1
-    ;;
  "l" | "list" )
-    LIST=1
+    echo "Available versions:"
+    definitions | indent
+    exit
    ;;
  "f" | "force" )
    FORCE=true
@ -124,16 +113,6 @@ for option in "${OPTIONS[@]}"; do
  esac
 done

-if [[ -n $LIST ]]; then
-  if [[ -n $BARE ]]; then
-    definitions
-  else
-    echo "Available versions:"
-    definitions | indent
-  fi
-  exit
-fi
-
 unset VERSION_NAME

 # The first argument contains the definition to install. If the
@ -144,20 +123,6 @@ DEFINITIONS=("${ARGUMENTS[@]}")
 [[ "${#DEFINITIONS[*]}" -eq 0 ]] && DEFINITIONS=($(pyenv-local 2>/dev/null || true))
 [[ "${#DEFINITIONS[*]}" -eq 0 ]] && usage 1 >&2

-# A `<version>:<alias>` argument installs <version> under the custom name
-# <alias>, so that several builds of the same version can coexist. The `latest`
-# suffix is reserved for latest-version resolution (see the `install` hook), so
-# it is left untouched here.
-declare -a ALIASES
-for i in "${!DEFINITIONS[@]}"; do
-  definition="${DEFINITIONS[$i]}"
-  alias="${definition##*:}"
-  if [[ "$definition" == *:* ]] && [ "$alias" != "latest" ]; then
-    DEFINITIONS[$i]="${definition%:*}"
-    ALIASES[$i]="$alias"
-  fi
-done
-
 # Define `before_install` and `after_install` functions that allow
 # plugin hooks to register a string of code for execution before or
 # after the installation process.
@ -187,9 +152,7 @@ IFS="$OLDIFS"
 for script in "${scripts[@]}"; do source "$script"; done

 COMBINED_STATUS=0
-for i in "${!DEFINITIONS[@]}"; do
-  DEFINITION="${DEFINITIONS[$i]}"
-  VERSION_ALIAS="${ALIASES[$i]}"
+for DEFINITION in "${DEFINITIONS[@]}"; do
  STATUS=0

  # Try to resolve a prefix if user indeed gave a prefix.
@ -198,12 +161,9 @@ for i in "${!DEFINITIONS[@]}"; do
  DEFINITION="$(pyenv-latest -f -k "$DEFINITION")"

  # Set VERSION_NAME from $DEFINITION. Then compute the installation prefix.
-  # With a `<version>:<alias>` argument, install under the alias instead;
-  # VERSION_NAME still reflects the real version so version-specific build logic
-  # (e.g. the bootstrap version detection below) keeps working.
  VERSION_NAME="${DEFINITION##*/}"
  [ -n "$DEBUG" ] && VERSION_NAME="${VERSION_NAME}-debug"
-  PREFIX="${PYENV_ROOT}/versions/${VERSION_ALIAS:-$VERSION_NAME}"
+  PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}"

  [ -d "${PREFIX}" ] && PREFIX_EXISTS=1

@ -228,7 +188,7 @@ for i in "${!DEFINITIONS[@]}"; do

  # If PYENV_BUILD_ROOT is set, always pass keep options to python-build.
  if [ -n "${PYENV_BUILD_ROOT}" ]; then
-    export PYTHON_BUILD_BUILD_PATH="${PYENV_BUILD_ROOT}/${VERSION_ALIAS:-$VERSION_NAME}"
+    export PYTHON_BUILD_BUILD_PATH="${PYENV_BUILD_ROOT}/${VERSION_NAME}"
    KEEP="-k"
  fi

--- a/plugins/python-build/bin/pyenv-install-prerequisites
+++ b/plugins/python-build/bin/pyenv-install-prerequisites
@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-#
-# Summary: Install Python build prerequisites on Debian-based systems
-#
-# Usage: pyenv install-prerequisites
-#
-set -e
-[ -n "$PYENV_DEBUG" ] && set -x
-
-# Provide pyenv completions
-if [ "$1" = "--complete" ]; then
-  exit
-fi
-
-usage() {
-  pyenv-help install-prerequisites 2>/dev/null
-  [ -z "$1" ] || exit "$1"
-}
-
-if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
-  usage 0
-fi
-
-[ "$#" -eq 0 ] || usage 1 >&2
-
-if ! command -v apt-get >/dev/null; then
-  echo "pyenv: installing build prerequisites is not supported on this system" >&2
-  exit 1
-fi
-
-prerequisites=(
-  make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev
-  libsqlite3-dev curl git llvm libncurses5-dev libncursesw5-dev xz-utils
-  tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev libzstd-dev
-)
-
-if [ "$(id -u)" -eq 0 ]; then
-  apt_get=(apt-get)
-elif command -v sudo >/dev/null; then
-  apt_get=(sudo apt-get)
-else
-  echo "pyenv: sudo is required to install build prerequisites" >&2
-  exit 1
-fi
-
-"${apt_get[@]}" update -q
-"${apt_get[@]}" install -yq "${prerequisites[@]}"
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@ -14,7 +14,7 @@
 #   -g/--debug       Build a debug version
 #

-PYTHON_BUILD_VERSION="2.8.5"
+PYTHON_BUILD_VERSION="2.6.28"

 OLDIFS="$IFS"

@ -1667,6 +1667,7 @@ use_macports_ncurses() {
 }

 prefer_openssl11() {
+  # Allow overriding the preference of OpenSSL version per definition basis (#1302, #1325, #1326)
  PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA="${PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA:-openssl@1.1 openssl}"
  export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA

@ -1676,21 +1677,15 @@ prefer_openssl11() {
 }

 prefer_openssl3() {
+  # Allow overriding the preference of OpenSSL version per definition basis (#1302, #1325, #1326)
  PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA="${PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA:-openssl@3 openssl@1.1 openssl}"
  export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA
  
+  # Set MacPorts OpenSSL formula names for MacPorts environment
  PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA="${PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA:-openssl3 openssl openssl11}"
  export PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA
 }

-prefer_openssl3_to_4() {
-  PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA="${PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA:-openssl@3 openssl@4 openssl@1.1 openssl}"
-  export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA
-  
-  PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA="${PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA:-openssl3 openssl4 openssl openssl11}"
-  export PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA
-}
-
 build_package_mac_readline() {
  # Install to a subdirectory since we don't want shims for bin/readline.
  READLINE_PREFIX_PATH="${PREFIX_PATH}/readline"
@ -1726,29 +1721,14 @@ use_homebrew_openssl() {
    local ssldir="$(brew --prefix "${openssl}" || true)"
    if [ -d "$ssldir" ]; then
      echo "python-build: use ${openssl} from homebrew"
-      # Since 970acdcad3be4262451e9a5180a385dd2158eda3 (openssl@3 3.1.1),
-      # Homebrew's openssl@3 is no longer keg-only.
-      # Python's --with-openssl* appends flags to the compiler's command line,
-      # which in combination with adding Homebrew's general dir to flags
-      # always causes the build to link to the non-keg `openssl'
-      # when the non-keg-only formula is installed.
-      # To counter that, we have to prepend the openssl path to flags
-      # regardless of using Configure options.
      if [[ -n "${PYTHON_BUILD_CONFIGURE_WITH_OPENSSL:-}" ]]; then
        # configure script of newer CPython versions support `--with-openssl`
        # https://bugs.python.org/issue21541
        package_option python configure --with-openssl="${ssldir}"
+      else
+        export CPPFLAGS="-I$ssldir/include ${CPPFLAGS:+ $CPPFLAGS}"
+        export LDFLAGS="-L$ssldir/lib${LDFLAGS:+ $LDFLAGS}"
      fi
-      # 3.10.0+ (https://github.com/python/cpython/pull/24820)
-      # but has no effect until 3.11.0 (b9e9292d75fdea621e05e39b8629e6935d282d0d)
-      # and broken in MacOS until 3.12.2 (cc13eabc7ce08accf49656e258ba500f74a1dae8)
-      if [[ -n $PYTHON_BUILD_CONFIGURE_WITH_OPENSSL_RPATH ]]; then
-        package_option python configure --with-openssl-rpath="${ssldir}/lib"
-      fi
-      export CPPFLAGS="-I${ssldir}/include ${CPPFLAGS:+ $CPPFLAGS}"
-      export LDFLAGS="-L${ssldir}/lib -Wl,-rpath,${ssldir}/lib${LDFLAGS:+ $LDFLAGS}"
-
-      
      export PKG_CONFIG_PATH="$ssldir/lib/pkgconfig/:${PKG_CONFIG_PATH}"
      lock_in homebrew
      return 0
@ -2112,12 +2092,10 @@ build_package_symlink_version_suffix() {

 verify_python() {
  build_package_symlink_version_suffix
-  
-  local python_bin="${PYTHON_BIN%/*}/python${1:?}"

-  if [ ! -x "${python_bin}" ]; then
+  if [ ! -x "${PYTHON_BIN}" ]; then
    { colorize 1 "ERROR"
-      echo ": invalid Python executable: ${python_bin}"
+      echo ": invalid Python executable: ${PYTHON_BIN}"
      echo
      echo "The python-build could not find proper executable of Python after successful build."
      echo "Please open an issue for future improvements."
@ -2298,11 +2276,6 @@ build_package_verify_py315() {
  build_package_verify_py314 "$1" "${2:-3.15}"
 }

-# Post-install check for Python 3.16.x
-build_package_verify_py316() {
-  build_package_verify_py315 "$1" "${2:-3.16}"
-}
-
 # Post-install check for Python 3.x rolling release scripts
 # XXX: Will need splitting into project-specific ones if there emerge
 # multiple rolling-release scripts with different checks needed
@ -2678,7 +2651,7 @@ if [ -z "${GET_PIP_URL}" ]; then
    2.6 | 2.6.* )
      GET_PIP_URL="https://bootstrap.pypa.io/pip/2.6/get-pip.py"
      ;;
-    2.7 | 2.7.* | pypy2.7 | pypy2.7-* | pypy-c-jit-* )
+    2.7 | 2.7.* | pypy2.7 | pypy2.7-* )
      GET_PIP_URL="https://bootstrap.pypa.io/pip/2.7/get-pip.py"
      ;;
    3.2 | 3.2.* )
@ -2702,9 +2675,6 @@ if [ -z "${GET_PIP_URL}" ]; then
    3.8 | 3.8.* | pypy3.8 | pypy3.8-* | pyston* )
      GET_PIP_URL="https://bootstrap.pypa.io/pip/3.8/get-pip.py"
      ;;
-    3.9 | 3.9.* | pypy3.9 | pypy3.9-* )
-      GET_PIP_URL="https://bootstrap.pypa.io/pip/3.9/get-pip.py"
-      ;;
    * )
      GET_PIP_URL="https://bootstrap.pypa.io/get-pip.py"
      ;;
--- a/plugins/python-build/scripts/add_cpython.py
+++ b/plugins/python-build/scripts/add_cpython.py
@ -17,7 +17,6 @@ import os.path
 import pathlib
 import pprint
 import re
-import shutil
 import subprocess
 import sys
 import typing
@ -40,14 +39,6 @@ EXCLUDED_VERSIONS= {
 here = pathlib.Path(__file__).resolve()
 OUT_DIR: pathlib.Path = here.parent.parent / "share" / "python-build"

-AUTO_ADD_VERSION_REF_RE = re.compile(
-    r"^(?P<object_id>[0-9a-f]{40,64})\t"
-    r"refs/heads/auto_add_version/(?P<versions>\S+)$"
-)
-OPENSSL_RELEASE_TAG_RE = re.compile(
-    r"^openssl-(?P<major>\d+)\.\d+(?:\.\d+)*(?:[a-z]+\d*)?$"
-)
-
 T_THUNK=\
 '''export PYTHON_BUILD_FREE_THREADING=1
 source "${BASH_SOURCE[0]%t}"
@ -85,13 +76,10 @@ def adapt_script(version: packaging.version.Version,
                                 url=new_package_url+'#'+new_package_hash,
                                 verify_py_suffix=verify_py_suffix)

-        elif m:=re.match(r'\s*install_package\s+'
-                         r'"(?P<package>openssl-(?P<openssl_major>\d+)\.\S+)"\s+'
-                         r'"(?P<url>\S+)"\s.*$',
+        elif m:=re.match(r'\s*install_package\s+"(?P<package>openssl-\S+)"\s+'
+                       r'"(?P<url>\S+)"\s.*$',
                         line):
-            item = VersionDirectory.openssl.get_store_latest_release(
-                int(m.group('openssl_major'))
-            )
+            item = VersionDirectory.openssl.get_store_latest_release()

            line = Re.sub_groups(m,
                               package=item.package_name,
@ -134,8 +122,6 @@ def add_version(version: packaging.version.Version):
        return False
    VersionDirectory.existing.append(_CPythonExistingScriptInfo(version,str(new_path)))

-    handle_version_patches(version, previous_version, is_prerelease_upgrade)
-
    cleanup_prerelease_upgrade(is_prerelease_upgrade, previous_version, version)

    handle_t_thunks(version, previous_version, is_prerelease_upgrade)
@ -144,52 +130,6 @@ def add_version(version: packaging.version.Version):
    return True


-def handle_version_patches(
-        version: packaging.version.Version,
-        previous_version: packaging.version.Version,
-        is_prerelease_upgrade: bool)\
-        -> None:
-    if (previous_version.major, previous_version.minor) != (version.major, version.minor):
-        return
-
-    patches_dir = OUT_DIR / "patches"
-    previous_patches = patches_dir / str(previous_version)
-    if not previous_patches.exists():
-        return
-
-    new_patches = patches_dir / str(version)
-    if is_prerelease_upgrade:
-        logger.info(f"Git moving patches from {previous_version} to {version}")
-        subprocess.check_call((
-            "git", "-C", OUT_DIR, "mv",
-            f"patches/{previous_version}",
-            f"patches/{version}",
-        ))
-    else:
-        logger.info(f"Copying patches from {previous_version} to {version}")
-        shutil.copytree(previous_patches, new_patches)
-
-    # Subdir rename as a separate step from upper dir copying/moving
-    # in case there are patches for dependency packages as well
-    previous_package_patches = new_patches / f"Python-{previous_version}"
-    new_package_patches = new_patches / f"Python-{version}"
-    if is_prerelease_upgrade:
-        subprocess.check_call((
-            "git", "-C", OUT_DIR, "mv",
-            f"patches/{version}/Python-{previous_version}",
-            f"patches/{version}/Python-{version}",
-        ))
-    else:
-        previous_package_patches.rename(new_package_patches)
-
-    if uses_t_thunks(previous_version) and is_prerelease_upgrade:
-        (patches_dir / f"{previous_version}t").unlink(missing_ok=True)
-    if uses_t_thunks(version):
-        (patches_dir / f"{version}t").symlink_to(
-            str(version), target_is_directory=True
-        )
-
-
 def cleanup_prerelease_upgrade(
        is_prerelease_upgrade: bool,
        previous_version: packaging.version.Version,
@ -219,7 +159,7 @@ def cleanup_prerelease_upgrade(


 def handle_t_thunks(version, previous_version, is_prerelease_upgrade):
-    if not uses_t_thunks(version):
+    if (version.major, version.minor) < (3, 13):
        return

    # an old thunk may have older version-specific code
@ -238,10 +178,6 @@ def handle_t_thunks(version, previous_version, is_prerelease_upgrade):
    thunk_path.write_text(T_THUNK, encoding='utf-8')


-def uses_t_thunks(version: packaging.version.Version) -> bool:
-    return (version.major, version.minor) >= (3, 13)
-
-
 Arguments: argparse.Namespace

 def main():
@ -256,29 +192,13 @@ def main():
    VersionDirectory.existing.populate()
    VersionDirectory.available.populate()

-    # Prereleases are placed under the same directory as the corresponding release.
-    # So until we know the release is out, its directory is a potential prerelease directory.
-    # Normally, prereleases are only made for initial releases (x.y.0) --
-    # but rarely, they may make them for other releases (e.g. 3.14.5).
-    for release in (v for v in frozenset(VersionDirectory.available.keys())     #refining alters the
-                                                                                #corresponding directory key
-                                                                                #which breaks iteration
-                                                                                #over the directory --
-                                                                                #so have to iterate over a copy
-                            if v not in VersionDirectory.existing):
-        VersionDirectory.available.get_store_available_source_downloads(release, True)
-        del release
+    for initial_release in (v for v in frozenset(VersionDirectory.available.keys())
+                            if v.micro == 0 and v not in VersionDirectory.existing):
+        # may actually be a prerelease
+        VersionDirectory.available.get_store_available_source_downloads(initial_release, True)
+        del initial_release

-    # Excluding versions for which there already are PRs.
-    # This will prevent us from using advanced features of
-    # peter-evans/create-pull-request Github Action
-    # like updating a PR and closing a superseded PR
-    # but we don't really need them as of this writing.
-    versions_to_add = sorted(
-        VersionDirectory.available.keys()
-        - VersionDirectory.existing.keys()
-        - get_pending_versions()
-    )
+    versions_to_add = sorted(VersionDirectory.available.keys() - VersionDirectory.existing.keys())

    logger.info("Versions to add:\n"+pprint.pformat(versions_to_add))
    result = False
@ -286,26 +206,6 @@ def main():
        result = add_version(version_to_add) or result
    return int(not result)

-
-def get_pending_versions() -> typing.Set[packaging.version.Version]:
-    ls_remote = subprocess.check_output(
-        ("git", "-C", OUT_DIR, "ls-remote", "origin",
-         "refs/heads/auto_add_version/*"),
-        text=True,
-        timeout=30,
-    )
-
-    pending_versions = set()
-    for line in ls_remote.splitlines():
-        if not (match := AUTO_ADD_VERSION_REF_RE.fullmatch(line)):
-            raise ValueError(f"Unexpected git ls-remote output line: {line!r}")
-        pending_versions.update(
-            packaging.version.Version(version)
-            for version in match.group("versions").split("_")
-        )
-    return pending_versions
-
-
 def parse_args():
    parser = argparse.ArgumentParser(description=__doc__)
    parser.add_argument(
@ -456,9 +356,8 @@ class CPythonAvailableVersionsDirectory(KeyedList[_CPythonAvailableVersionInfo,
            download_version = packaging.version.Version(m.group("version"))
            if download_version != version:
                if not refine_mode:
-                    logger.warning(f"Ignoring download {name} ({download_version}) "
-                                     f"for {version} at page {entry.download_page_url}")
-                    continue
+                    raise ValueError(f"Unexpectedly found a download {name} for {download_version} "
+                                     f"at page {entry.download_page_url} for {version}")
                entry_to_fill = additional_versions_found.get_or_create(
                    download_version,
                    download_page_url=entry.download_page_url
@ -471,10 +370,7 @@ class CPythonAvailableVersionsDirectory(KeyedList[_CPythonAvailableVersionInfo,
                m.group("extension"), m.group('package'), url
            ))

-        # XXX: Exact download not found in non-refine mode never happens now
-        # 'cuz we first call the function in refine mode.
-        # Decide what's best to do if it starts to after a logic change.
-        if not exact_download_found and refine_mode:
+        if not exact_download_found:
            actual_version = max(additional_versions_found.keys())
            logger.debug(f"Refining available version {version} to {actual_version}")
            del self[version]
@ -506,7 +402,7 @@ class CPythonExistingScriptsDirectory(KeyedList[_CPythonExistingScriptInfo, pack
                v = packaging.version.Version(entry_name)
                if v < CUTOFF_VERSION:
                    continue
-                # branch tip scripts are different from release scripts and thus unusable as a pattern
+                # branch tip scrpts are different from release scripts and thus unusable as a pattern
                if v.dev is not None:
                    continue
                logger.debug(f"Existing version {v}")
@ -531,43 +427,21 @@ class _OpenSSLVersionInfo(typing.NamedTuple):
 class OpenSSLVersionsDirectory(KeyedList[_OpenSSLVersionInfo, packaging.version.Version]):
    key_field = "version"

-    def get_store_latest_release(self, major: int) \
+    def get_store_latest_release(self) \
            -> _OpenSSLVersionInfo:
-        matching = [
-            release for release in self
-            if release.version.major == major
-        ]
-        if matching:
-            return max(matching, key=lambda release: release.version)
-
-        url = "https://api.github.com/repos/openssl/openssl/releases"
-        while url:
-            response = Requests.get(url)
-            matching = [
-                release
-                for release in response.json()
-                if not release['draft']
-                and not release['prerelease']
-                and (match := OPENSSL_RELEASE_TAG_RE.fullmatch(
-                    release['tag_name']
-                ))
-                and int(match.group('major')) == major
-            ]
-            if matching:
-                j_release = matching[0]
-                break
-            url = response.links.get('next', {}).get('url')
-        else:
-            raise ValueError(f"No OpenSSL {major}.x release found")
+        if self:
+            #already retrieved
+            return self[max(self.keys())]

+        j = requests.get("https://api.github.com/repos/openssl/openssl/releases/latest").json()
        # noinspection PyTypeChecker
        # urlparse can parse str as well as bytes
        shasum_url = more_itertools.one(
            asset['browser_download_url']
-            for asset in j_release['assets']
+            for asset in j['assets']
            if urllib.parse.urlparse(asset['browser_download_url']).path.split('/')[-1].endswith('.sha256')
        )
-        shasum_text = Requests.get(shasum_url).text
+        shasum_text = requests.get(shasum_url).text
        shasum_data = jc.parse("hashsum", shasum_text, quiet=True)[0]
        package_hash, package_filename = shasum_data["hash"], shasum_data["filename"]
        del shasum_data, shasum_text, shasum_url
@ -580,7 +454,7 @@ class OpenSSLVersionsDirectory(KeyedList[_OpenSSLVersionInfo, packaging.version.

        package_url = more_itertools.one(
            asset['browser_download_url']
-            for asset in j_release['assets']
+            for asset in j['assets']
            if urllib.parse.urlparse(asset['browser_download_url']).path.split('/')[-1] == package_filename
        )

@ -662,8 +536,7 @@ class DownloadPage:
        """
        if session is None:
            session = requests_html.HTMLSession()
-        response = session.get(url, timeout=30)
-        response.raise_for_status()
+        response = session.get(url)
        page = response.html
        table = page.find("pre", first=True)
        # some GNU mirrors format entries as a table
@ -733,7 +606,7 @@ class Url:
            session = requests_html.HTMLSession()
        logger.info(f"Downloading and computing hash of {url}")
        h=hashlib.sha256()
-        r=session.get(url,stream=True,timeout=30)
+        r=session.get(url,stream=True)
        total_bytes=int(r.headers.get('content-length',0)) or float('inf')
        with tqdm.tqdm(total=total_bytes, unit='B', unit_scale=True, unit_divisor=1024) as t:
            for c in r.iter_content(1024):
@ -741,18 +614,6 @@ class Url:
                h.update(c)
        return h.hexdigest()

-class Requests:
-    @staticmethod
-    def get(url: str) -> requests.Response:
-        response = requests.get(url, timeout=30)
-        response.raise_for_status()
-        return response
-

 if __name__ == "__main__":
-    #sys.excepthook seems to have no effect in Github Actions
-    try:
-        sys.exit(main())
-    except Exception:
-        logging.exception("Unhandled exception occurred")
-        sys.exit(2)
+    sys.exit(main())
--- a/plugins/python-build/scripts/add_miniconda.py
+++ b/plugins/python-build/scripts/add_miniconda.py
@ -219,10 +219,7 @@ class CondaVersion(NamedTuple):
                # since 4.8, Miniconda specifies versions explicitly in the file name
                raise ValueError("Miniconda 4.8+ is supposed to specify a Python version explicitly")
        if self.flavor == "anaconda":
-            # Info about the bundled Python version
-            # https://www.anaconda.com/docs/getting-started/anaconda/release-notes
-            if v >= (2026,7):
-                return PyVersion.PY314
+            # https://www.anaconda.com/docs/tools/anaconda-org/release-notes
            if v >= (2025,6):
                return PyVersion.PY313
            if v >= (2024,6):
--- a/plugins/python-build/scripts/add_miniforge.py
+++ b/plugins/python-build/scripts/add_miniforge.py
@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 'Adds the latest miniforge and mambaforge releases.'
 from pathlib import Path
-import argparse
 import logging
 import os
 import string
@ -9,7 +8,7 @@ import string
 import requests

 logger = logging.getLogger(__name__)
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=os.environ.get('LOGLEVEL', 'INFO'))

 MINIFORGE_REPO = 'conda-forge/miniforge'
 DISTRIBUTIONS = ['miniforge']
@ -22,8 +21,6 @@ SKIPPED_RELEASES = [
    '22.11.1-2',    #MacOS packages are broken (have broken dep tarballs, downloading them fails with 403)
    '25.3.0-0',     #marked as prerelease, no Linux version
    '25.11.0-0',    #regression reported in constructor, re-released as 25.11.0-1 with hotfix bumping to constructor>=3.14 (was >=3.12, 3.13 implicit)
-    '26.1.1-0',     #prerelease, no binary assets
-    '26.1.1-1',     #prerelease, no binary assets
 ]

 install_script_fmt = """
@ -89,9 +86,6 @@ def py_version(version):
    # transition points:
    # https://github.com/conda-forge/miniforge/blame/main/Miniforge3/construct.yaml
    # look for "- python <version>" in non-pypy branch and which tag the commit is first in
-    if version_tuple_ >= (26,1):
-        # https://github.com/conda-forge/miniforge/commit/0016367731e52c67234d6d0e7e6a24c6bf7673e4
-        return "313"
    if version_tuple_ >= (24,5):
        # yes, they jumped from 3.10 directly to 3.12
        # https://github.com/conda-forge/miniforge/commit/bddad0baf22b37cfe079e47fd1680fdfb2183590
@ -101,14 +95,13 @@ def py_version(version):
    raise ValueError("Bundled Python version unknown for release `%s'"%version)

 def supported(filename):
-    return ('pypy' not in filename) and ('Windows' not in filename) and (not filename.endswith('.pkg'))
+    return ('pypy' not in filename) and ('Windows' not in filename)

 def add_version(release, distributions):
    tag_name = release['tag_name']
    download_urls = { f['name']: f['browser_download_url'] for f in release['assets'] }
    # can assume that sha files are named similar to release files so can also check supported(on their names)
-    shas = dict([download_sha(url) for (name, url) in download_urls.items()
-        if name.endswith('.sha256') and supported(os.path.splitext(name)[0]) and tag_name in name])
+    shas = dict([download_sha(url) for (name, url) in download_urls.items() if name.endswith('.sha256') and supported(os.path.basename(name)) and tag_name in name])
    specs = [create_spec(filename, sha, download_urls[filename]) for (filename, sha) in shas.items() if supported(filename)]
    

@ -139,7 +132,7 @@ def main():
        if version in SKIPPED_RELEASES:
            continue

-        logger.debug(f'Looking for {version} in {out_dir}')
+        logger.info(f'Looking for {version} in {out_dir}')

        # mambaforge is retired https://github.com/conda-forge/miniforge/releases/tag/24.11.2-0
        if version_tuple(version) >= (24, 11, 2):
@ -152,17 +145,4 @@ def main():
            add_version(release, distributions)

 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument(
-        "-d", "--dry-run", action="store_true",
-        help="Do not write scripts, just report them to stdout",
-    )
-    parser.add_argument(
-        "-v", "--verbose", action="store_true", default=0,
-        help="Increase verbosity of logging",
-    )
-    parsed = parser.parse_args()
-    
-    if parsed.verbose: logging.getLogger.setLevel(logging.DEBUG)
-    
    main()
--- a/plugins/python-build/scripts/requirements.txt
+++ b/plugins/python-build/scripts/requirements.txt
@ -1,9 +1,9 @@
 more_itertools
 requests-html
-fake_useragent<2; python_version < "3.9"
+fake_useragent<2
 lxml[html_clean]
 packaging
 requests
 sortedcontainers
 tqdm
-jc
+jc @ git+https://github.com/native-api/jc@haslib_mode
--- a/plugins/python-build/share/python-build/2.7-dev
+++ b/plugins/python-build/share/python-build/2.7-dev
@ -1,6 +1,4 @@
-export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA="${PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA:-openssl@1.1 openssl@1.0}"
-export PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA="${PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA:-openssl11 openssl10}"
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
+prefer_openssl11
 install_package "openssl-1.1.0j" "https://www.openssl.org/source/old/1.1.0/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 install_git "Python-2.7-dev" "https://github.com/python/cpython" "2.7" standard verify_py27 copy_python_gdb ensurepip
--- a/plugins/python-build/share/python-build/2.7.0
+++ b/plugins/python-build/share/python-build/2.7.0
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 install_package "Python-2.7" "https://www.python.org/ftp/python/2.7/Python-2.7.tgz#5670dd6c0c93b0b529781d070852f7b51ce6855615b16afcd318341af2910fb5" standard verify_py27 copy_python_gdb ensurepip
--- a/plugins/python-build/share/python-build/2.7.1
+++ b/plugins/python-build/share/python-build/2.7.1
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 install_package "Python-2.7.1" "https://www.python.org/ftp/python/2.7.1/Python-2.7.1.tgz#ca13e7b1860821494f70de017202283ad73b1fb7bd88586401c54ef958226ec8" standard verify_py27 copy_python_gdb ensurepip
--- a/plugins/python-build/share/python-build/2.7.10
+++ b/plugins/python-build/share/python-build/2.7.10
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
--- a/plugins/python-build/share/python-build/2.7.11
+++ b/plugins/python-build/share/python-build/2.7.11
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
--- a/plugins/python-build/share/python-build/2.7.12
+++ b/plugins/python-build/share/python-build/2.7.12
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
--- a/plugins/python-build/share/python-build/2.7.13
+++ b/plugins/python-build/share/python-build/2.7.13
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
--- a/plugins/python-build/share/python-build/2.7.14
+++ b/plugins/python-build/share/python-build/2.7.14
@ -1,6 +1,4 @@
-export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA="${PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA:-openssl@1.1 openssl@1.0}"
-export PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA="${PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA:-openssl11 openssl10}"
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
+prefer_openssl11
 install_package "openssl-1.1.0j" "https://www.openssl.org/source/old/1.1.0/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
--- a/plugins/python-build/share/python-build/2.7.15
+++ b/plugins/python-build/share/python-build/2.7.15
@ -1,6 +1,4 @@
-export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA="${PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA:-openssl@1.1 openssl@1.0}"
-export PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA="${PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA:-openssl11 openssl10}"
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
+prefer_openssl11
 install_package "openssl-1.1.0j" "https://www.openssl.org/source/old/1.1.0/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
--- a/plugins/python-build/share/python-build/2.7.16
+++ b/plugins/python-build/share/python-build/2.7.16
@ -1,6 +1,3 @@
-export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA="${PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA:-openssl@1.1 openssl@1.0}"
-export PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA="${PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA:-openssl11 openssl10}"
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2q" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2q.tar.gz#5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
--- a/plugins/python-build/share/python-build/2.7.17
+++ b/plugins/python-build/share/python-build/2.7.17
@ -1,6 +1,3 @@
-export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA="${PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA:-openssl@1.1 openssl@1.0}"
-export PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA="${PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA:-openssl11 openssl10}"
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2q" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2q.tar.gz#5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
--- a/plugins/python-build/share/python-build/2.7.18
+++ b/plugins/python-build/share/python-build/2.7.18
@ -1,6 +1,4 @@
-export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA="${PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA:-openssl@1.1 openssl@1.0}"
-export PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA="${PYTHON_BUILD_MACPORTS_OPENSSL_FORMULA:-openssl11 openssl10}"
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
+export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA="openssl@1.1 openssl@1.0 openssl"
 install_package "openssl-1.1.1v" "https://www.openssl.org/source/openssl-1.1.1v.tar.gz" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
--- a/plugins/python-build/share/python-build/2.7.2
+++ b/plugins/python-build/share/python-build/2.7.2
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 install_package "Python-2.7.2" "https://www.python.org/ftp/python/2.7.2/Python-2.7.2.tgz#1d54b7096c17902c3f40ffce7e5b84e0072d0144024184fff184a84d563abbb3" standard verify_py27 copy_python_gdb ensurepip
--- a/plugins/python-build/share/python-build/2.7.3
+++ b/plugins/python-build/share/python-build/2.7.3
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 install_package "Python-2.7.3" "https://www.python.org/ftp/python/2.7.3/Python-2.7.3.tgz#d4c20f2b5faf95999fd5fecb3f7d32071b0820516224a6d2b72932ab47a1cb8e" standard verify_py27 copy_python_gdb ensurepip
--- a/plugins/python-build/share/python-build/2.7.4
+++ b/plugins/python-build/share/python-build/2.7.4
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 install_package "Python-2.7.4" "https://www.python.org/ftp/python/2.7.4/Python-2.7.4.tgz#98c5eb9c8e65effcc0122112ba17a0bce880aa23ecb560af56b55eb55632b81a" standard verify_py27 copy_python_gdb ensurepip
--- a/plugins/python-build/share/python-build/2.7.5
+++ b/plugins/python-build/share/python-build/2.7.5
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 install_package "Python-2.7.5" "https://www.python.org/ftp/python/2.7.5/Python-2.7.5.tgz#8e1b5fa87b91835afb376a9c0d319d41feca07ffebc0288d97ab08d64f48afbf" standard verify_py27 copy_python_gdb ensurepip
--- a/plugins/python-build/share/python-build/2.7.6
+++ b/plugins/python-build/share/python-build/2.7.6
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 install_package "Python-2.7.6" "https://www.python.org/ftp/python/2.7.6/Python-2.7.6.tgz#99c6860b70977befa1590029fae092ddb18db1d69ae67e8b9385b66ed104ba58" standard verify_py27 copy_python_gdb ensurepip
--- a/plugins/python-build/share/python-build/2.7.7
+++ b/plugins/python-build/share/python-build/2.7.7
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
--- a/plugins/python-build/share/python-build/2.7.8
+++ b/plugins/python-build/share/python-build/2.7.8
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
--- a/plugins/python-build/share/python-build/2.7.9
+++ b/plugins/python-build/share/python-build/2.7.9
@ -1,4 +1,3 @@
-export PYTHON_CFLAGS="${PYTHON_CFLAGS:+$PYTHON_CFLAGS }-std=c99"
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/old/1.0.2/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
 if has_tar_xz_support; then
--- a/plugins/python-build/share/python-build/3.10.21
+++ b/plugins/python-build/share/python-build/3.10.21
@ -1,9 +0,0 @@
-prefer_openssl3
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=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.10.21" "https://www.python.org/ftp/python/3.10.21/Python-3.10.21.tar.xz#a0da1e72132e950154eca0f6f47d5db828454700de20e5113667940d81e0db04" standard verify_py310 copy_python_gdb ensurepip
-else
-    install_package "Python-3.10.21" "https://www.python.org/ftp/python/3.10.21/Python-3.10.21.tgz#f276987f06270ae6c1fb4da620bd105edf78c31368c2f7e85e6c1d51c560b04b" standard verify_py310 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/3.11.0
+++ b/plugins/python-build/share/python-build/3.11.0
@ -1,6 +1,5 @@
 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-1.1.1q" "https://www.openssl.org/source/openssl-1.1.1q.tar.gz#d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.1
+++ b/plugins/python-build/share/python-build/3.11.1
@ -1,6 +1,5 @@
 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-1.1.1s" "https://www.openssl.org/source/openssl-1.1.1s.tar.gz#c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.10
+++ b/plugins/python-build/share/python-build/3.11.10
@ -1,6 +1,5 @@
 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.2.2" "https://openssl.org/source/old/3.2/openssl-3.2.2.tar.gz#197149c18d9e9f292c43f0400acaba12e5f52cacfe050f3d199277ea738ec2e7" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.11
+++ b/plugins/python-build/share/python-build/3.11.11
@ -1,6 +1,5 @@
 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.2.2" "https://openssl.org/source/old/3.2/openssl-3.2.2.tar.gz#197149c18d9e9f292c43f0400acaba12e5f52cacfe050f3d199277ea738ec2e7" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.12
+++ b/plugins/python-build/share/python-build/3.11.12
@ -1,6 +1,5 @@
 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.2.4" "https://github.com/openssl/openssl/releases/download/openssl-3.2.4/openssl-3.2.4.tar.gz#b23ad7fd9f73e43ad1767e636040e88ba7c9e5775bfa5618436a0dd2c17c3716" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.13
+++ b/plugins/python-build/share/python-build/3.11.13
@ -1,6 +1,5 @@
 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.2.4" "https://github.com/openssl/openssl/releases/download/openssl-3.2.4/openssl-3.2.4.tar.gz#b23ad7fd9f73e43ad1767e636040e88ba7c9e5775bfa5618436a0dd2c17c3716" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.14
+++ b/plugins/python-build/share/python-build/3.11.14
@ -1,6 +1,5 @@
 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.2.4" "https://github.com/openssl/openssl/releases/download/openssl-3.2.4/openssl-3.2.4.tar.gz#b23ad7fd9f73e43ad1767e636040e88ba7c9e5775bfa5618436a0dd2c17c3716" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.15
+++ b/plugins/python-build/share/python-build/3.11.15
@ -1,6 +1,5 @@
 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.1" "https://github.com/openssl/openssl/releases/download/openssl-3.6.1/openssl-3.6.1.tar.gz#b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e" 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
--- a/plugins/python-build/share/python-build/3.11.16
+++ b/plugins/python-build/share/python-build/3.11.16
@ -1,11 +0,0 @@
-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.11.16" "https://www.python.org/ftp/python/3.11.16/Python-3.11.16.tar.xz#91bcdebfdde239a003ae93738a7fce0f9230fee5c4bc2b86f6e6e8c6f98aabe8" standard verify_py311 copy_python_gdb ensurepip
-else
-    install_package "Python-3.11.16" "https://www.python.org/ftp/python/3.11.16/Python-3.11.16.tgz#6c0bd76ab0ec7d94ed400b1497f01ac6c7751c8822615ee0855a3eb2d893ea76" standard verify_py311 copy_python_gdb ensurepip
-fi
--- a/plugins/python-build/share/python-build/3.11.2
+++ b/plugins/python-build/share/python-build/3.11.2
@ -1,6 +1,5 @@
 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-1.1.1s" "https://www.openssl.org/source/openssl-1.1.1s.tar.gz#c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.3
+++ b/plugins/python-build/share/python-build/3.11.3
@ -1,6 +1,5 @@
 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-1.1.1s" "https://www.openssl.org/source/openssl-1.1.1s.tar.gz#c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.4
+++ b/plugins/python-build/share/python-build/3.11.4
@ -1,6 +1,5 @@
 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-1.1.1s" "https://www.openssl.org/source/openssl-1.1.1s.tar.gz#c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.5
+++ b/plugins/python-build/share/python-build/3.11.5
@ -1,6 +1,5 @@
 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.2.0" "https://www.openssl.org/source/openssl-3.2.0.tar.gz#14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.6
+++ b/plugins/python-build/share/python-build/3.11.6
@ -1,6 +1,5 @@
 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.2.0" "https://www.openssl.org/source/openssl-3.2.0.tar.gz#14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.7
+++ b/plugins/python-build/share/python-build/3.11.7
@ -1,6 +1,5 @@
 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.2.0" "https://www.openssl.org/source/openssl-3.2.0.tar.gz#14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.8
+++ b/plugins/python-build/share/python-build/3.11.8
@ -1,6 +1,5 @@
 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.2.1" "https://www.openssl.org/source/openssl-3.2.1.tar.gz#83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.11.9
+++ b/plugins/python-build/share/python-build/3.11.9
@ -1,6 +1,5 @@
 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.2.1" "https://www.openssl.org/source/openssl-3.2.1.tar.gz#83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.12-dev
+++ b/plugins/python-build/share/python-build/3.12-dev
@ -1,6 +1,5 @@
 prefer_openssl3
 export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL_RPATH=1
 export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
 export PYTHON_BUILD_CONFIGURE_WITH_DSYMUTIL=1
 install_package "openssl-3.1.2" "https://www.openssl.org/source/openssl-3.1.2.tar.gz#a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" mac_openssl --if has_broken_mac_openssl
--- a/plugins/python-build/share/python-build/3.12.0
+++ b/plugins/python-build/share/python-build/3.12.0
@ -1,6 +1,5 @@
 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.1.2" "https://www.openssl.org/source/openssl-3.1.2.tar.gz#a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.12.1
+++ b/plugins/python-build/share/python-build/3.12.1
@ -1,6 +1,5 @@
 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.1.2" "https://www.openssl.org/source/openssl-3.1.2.tar.gz#a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.12.10
+++ b/plugins/python-build/share/python-build/3.12.10
@ -1,6 +1,5 @@
 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.3.3" "https://github.com/openssl/openssl/releases/download/openssl-3.3.3/openssl-3.3.3.tar.gz#712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.12.11
+++ b/plugins/python-build/share/python-build/3.12.11
@ -1,6 +1,5 @@
 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.5.1" "https://github.com/openssl/openssl/releases/download/openssl-3.5.1/openssl-3.5.1.tar.gz#529043b15cffa5f36077a4d0af83f3de399807181d607441d734196d889b641f" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/plugins/python-build/share/python-build/3.12.12
+++ b/plugins/python-build/share/python-build/3.12.12
@ -1,6 +1,5 @@
 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.5.1" "https://github.com/openssl/openssl/releases/download/openssl-3.5.1/openssl-3.5.1.tar.gz#529043b15cffa5f36077a4d0af83f3de399807181d607441d734196d889b641f" mac_openssl --if has_broken_mac_openssl
 install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
--- a/Show more
+++ b/Show more