Add support for managed Python 3.13 and update CPython versions #7263

zanieb · 2024-09-10T17:40:43Z

Adds support for CPython 3.13.0rc2

Also bumps to the latest patch version of all the other CPython minor versions we support.

…uring `uv python list` (#7131)" This reverts commit 8eff8aa.

…7264) This caused some problems earlier, as it prevented us from _listing_ Python versions <3.7 which seems weird (see #7131 (comment)) I'm worried that without this the changes to installation key parsing in #7263 would otherwise be too restrictive. I think if we want to enforce these ranges, we should do so separately from the parse step.

zanieb · 2024-09-10T18:54:36Z

crates/uv-python/src/installation.rs

-            })?[..]
-        else {
-            return Err(PythonInstallationKeyError::ParseError(
+        let version = PythonVersion::from_str(version).map_err(|err| {


Annoyed that we parse here then unparse and parse later but it seemed painful otherwise.

The alternative is to hand-roll the parser like I do in the download metadata Python script.

zanieb · 2024-09-10T18:58:00Z

crates/uv-python/src/installation.rs

+    pub fn version(&self) -> PythonVersion {
+        PythonVersion::from_str(&format!(
+            "{}.{}.{}{}",
+            self.major, self.minor, self.patch, self.prerelease
+        ))
+        .expect("Python installation keys must have valid Python versions")
    }


Reverted #7131 because we dropped that validation in #7264

zanieb · 2024-09-10T18:59:25Z

crates/uv-python/fetch-download-metadata.py

-            cpython-(?P<ver>\d+\.\d+\.\d+?)
+            cpython-(?P<ver>\d+\.\d+\.\d+(?:(?:a|b|rc)\d+)?)


Needed to add support for pre-releases throughout

zanieb · 2024-09-10T18:59:46Z

crates/uv-python/fetch-download-metadata.py

@@ -455,7 +464,9 @@ def sort_key(download: PythonDownload) -> tuple:
    results = {}
    for download in downloads:
        key = download.key()
-        logging.info("Found %s (%s)", key, download.flavor)
+        logging.info(
+            "Found %s%s", key, (" (%s)" % download.flavor) if download.flavor else ""


Just a nit here that we were printing an empty () when there was no flavor (e.g. for PyPy)

charliermarsh

Generally looks reasonable. Why Cow and not &'static str? Do we pass in String somewhere to create those ourselves?

zanieb · 2024-09-10T19:34:09Z

Supersedes #7256

…equest (#7278) Following #7263 the 3.13.0rc2 releases are at the top of the download list but we should not select them unless 3.13 is actually requested. Prior to this, `uv python install` would install `3.13.0rc2`. ``` ❯ cargo run -- python install --no-config Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.14s Running `target/debug/uv python install --no-config` Searching for Python installations Installed Python 3.12.6 in 1.33s + cpython-3.12.6-macos-aarch64-none ``` ``` ❯ cargo run -- python install --no-config 3.13 Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.14s Running `target/debug/uv python install --no-config 3.13` Searching for Python versions matching: Python 3.13 Installed Python 3.13.0rc2 in 1.18s + cpython-3.13.0rc2-macos-aarch64-none ```

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.4.4` -> `0.4.9` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>astral-sh/uv (astral-sh/uv)</summary> ### [`v0.4.9`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#049) [Compare Source](astral-sh/uv@0.4.8...0.4.9) ##### Enhancements - Add support for managed Python 3.13 ([#7263](astral-sh/uv#7263)) - Upgrade managed CPython versions to latest patch releases ([#7263](astral-sh/uv#7263)) - Allow setting a target version for `uv self update` ([#7252](astral-sh/uv#7252)) - Create `py.typed` files during `uv init --lib` ([#7232](astral-sh/uv#7232)) - Add a dedicated error for packages that fail due to `distutils` deprecation ([#7239](astral-sh/uv#7239)) - Improve error message when requested Python version is unsupported ([#7269](astral-sh/uv#7269)) - Add `uv run --no-sync` ([#7192](\(astral-sh/uv#7192)) ##### Bug fixes - Avoid updating `pyproject.toml` offsets on non-add edits ([#7262](astral-sh/uv#7262)) - Invalidate cache when `--config-settings` change ([#7139](astral-sh/uv#7139)) - Remove workspace root for single-member workspace with `uv export` ([#7254](astral-sh/uv#7254)) ### [`v0.4.8`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#048) [Compare Source](astral-sh/uv@0.4.7...0.4.8) ##### Enhancements - Add support for dynamic cache keys ([#7136](astral-sh/uv#7136)) - Allow `.dist-info` names with dashes for post releases ([#7208](astral-sh/uv#7208)) - Use type hints in code from `uv init` ([#7225](astral-sh/uv#7225)) - Treat `.tgz` the same as `.tar.gz` ([#7201](astral-sh/uv#7201)) - Direct users towards `uv venv` to create a virtual environment ([#7188](astral-sh/uv#7188)) - Improve error message for uv init already init-ed ([#7198](astral-sh/uv#7198)) ##### Performance - Avoid batch prefetching for un-optimized registries ([#7226](astral-sh/uv#7226)) - Avoid iteration for singleton selections ([#7195](astral-sh/uv#7195)) ##### Bug fixes - Avoid extra newlines in debug logging for source builds ([#7174](astral-sh/uv#7174)) - Prune unreachable packages from `--universal` output ([#7209](astral-sh/uv#7209)) - Respect exclusion when collecting workspace members ([#7175](astral-sh/uv#7175)) - Use path file instead of `sitecustomize.py` ([#7161](astral-sh/uv#7161)) - Replace incorrect `--source` and `--binary` flags with correct `--sdist` and `--wheel` flags in `uv build` ([#7156](astral-sh/uv#7156)) ##### Documentation - Document support for `UV_INSTALL_DIR` ([#7107](astral-sh/uv#7107)) - List all supported sdist formats ([#7168](astral-sh/uv#7168)) ### [`v0.4.7`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#047) [Compare Source](astral-sh/uv@0.4.6...0.4.7) ##### Enhancements - Add `--no-emit-project` and friends to `uv export` ([#7110](astral-sh/uv#7110)) - Add `--output-file` to `uv export` ([#7109](astral-sh/uv#7109)) - Prune unused source distributions from the cache in `uv cache prune` ([#7112](astral-sh/uv#7112)) - Take intersection of constraint and requirements hashes ([#7108](astral-sh/uv#7108)) ##### Performance - Skip metadata fetch for `--no-deps` and `pip sync` ([#7127](astral-sh/uv#7127)) ##### Bug fixes - Avoid panicking when encountering an invalid Python version during `uv python list` ([#7131](astral-sh/uv#7131)) - Write trailing newline to `.python-version` files ([#7140](astral-sh/uv#7140)) ### [`v0.4.6`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#046) [Compare Source](astral-sh/uv@0.4.5...0.4.6) ##### Enhancements - Accept `--build-constraints` in `uv build` ([#7085](astral-sh/uv#7085)) - Add `--require-hashes` and `--verify-hashes` to `uv build` ([#7094](astral-sh/uv#7094)) - Add `--show-version-specifiers` to `uv tool list` ([#7050](astral-sh/uv#7050)) - Respect hashes in constraints files ([#7093](astral-sh/uv#7093)) - Upgrade installer scripts ([#7092](astral-sh/uv#7092)) - Allow specifying multiple packages in `uv tool upgrade` and `uninstall` ([#7037](astral-sh/uv#7037)) - Sort by implementation in `uv python list` ([#6918](astral-sh/uv#6918)) ##### Bug fixes - Invalidate lockfile when member versions change ([#7102](astral-sh/uv#7102)) - Strip fragments from direct source URLs in lockfile ([#7061](astral-sh/uv#7061)) - Support `--no-build` and `--no-binary` in `uv sync` et al ([#7100](astral-sh/uv#7100)) - Use distribution hash over registry hash ([#7060](astral-sh/uv#7060)) - Fix inverted log message ([#7063](astral-sh/uv#7063)) - Adjust Docker `ENTRYPOINT` and `CMD` for inherited images ([#7054](astral-sh/uv#7054)) ##### Documentation - Add winget to installers ([#7088](astral-sh/uv#7088)) - Document how to disable path modifications during install ([#7090](astral-sh/uv#7090)) - Document how to manually update locked package version ([#7083](astral-sh/uv#7083)) - Document official `setup-uv` action ([#7056](astral-sh/uv#7056)) - Update docs on `.python-version` file ([#7051](astral-sh/uv#7051)) ### [`v0.4.5`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#045) [Compare Source](astral-sh/uv@0.4.4...0.4.5) ##### Enhancements - Implement `uv build` ([#6895](astral-sh/uv#6895)) - Add `--package` support to `uv build` ([#6990](astral-sh/uv#6990)) - Prune unreachable packages from lockfile ([#6959](astral-sh/uv#6959)) - Prune unreachable wheels from lockfile ([#6961](astral-sh/uv#6961)) - Show build output by default in `uv build` ([#6912](astral-sh/uv#6912)) - Support `uv build --wheel` from source distributions ([#6898](astral-sh/uv#6898)) - Use the root project name for the project virtual environment prompt ([#7021](astral-sh/uv#7021)) ##### Bug fixes - Fix handling of inline optional dependencies in `uv add` ([#7023](astral-sh/uv#7023)) - Reflect exit code in `uv tool run` and `uv run` ([#6994](astral-sh/uv#6994)) - Revert `pyproject.toml` modifications on Ctrl-C ([#7024](astral-sh/uv#7024)) - Rollback `pyproject.toml` changes on all errors ([#7022](astral-sh/uv#7022)) - Use correct ordering semantics for narrowing upper-bounded Python requirements ([#7031](astral-sh/uv#7031)) - Fix segfault in Windows trampolines ([#6955](astral-sh/uv#6955)) - Remove unused `__future__.annotations` import in `_virtualenv.py` ([#6996](astral-sh/uv#6996)) ##### Documentation - Add documentation for `uv build` ([#6991](astral-sh/uv#6991)) - Add note to `extra` and `all-extras` in `uv sync` help ([#7013](astral-sh/uv#7013)) - Add project docs for `project.scripts` ([#7010](astral-sh/uv#7010)) - Fix available Docker image tag rendering and shorten list ([#7017](astral-sh/uv#7017)) - Touchup to the project environment config section ([#7038](astral-sh/uv#7038)) - Clarify precedence of `uv.toml` ([#6986](astral-sh/uv#6986)) - Fix available Docker tags for `-slim` variants ([#7041](astral-sh/uv#7041)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

zanieb added the enhancement New feature or request label Sep 10, 2024

zanieb mentioned this pull request Sep 10, 2024

Drop Python version range enforcement from PythonVersion::from_str #7264

Merged

zanieb added 2 commits September 10, 2024 14:15

Add support for managed Python 3.13

d278e53

Revert "Avoid panicking when encountering an invalid Python version d…

96e1d2f

…uring `uv python list` (#7131)" This reverts commit 8eff8aa.

zanieb force-pushed the zb/python-313 branch from c25ec11 to 96e1d2f Compare September 10, 2024 18:18

zanieb marked this pull request as ready for review September 10, 2024 18:53

zanieb commented Sep 10, 2024

View reviewed changes

zanieb changed the title ~~Add support for managed Python 3.13~~ Add support for managed Python 3.13 and update CPython versions Sep 10, 2024

zanieb commented Sep 10, 2024

View reviewed changes

charliermarsh approved these changes Sep 10, 2024

View reviewed changes

zanieb mentioned this pull request Sep 10, 2024

Add support for pre-releases in Python version requests #7270

Open

zanieb merged commit 0e98700 into main Sep 10, 2024
58 checks passed

zanieb deleted the zb/python-313 branch September 10, 2024 19:36

This was referenced Sep 10, 2024

Display the Python version in malformed installation key traces #7272

Closed

Avoid selecting pre-releases for Python downloads without a version request #7278

Merged

BrewTestBot mentioned this pull request Sep 11, 2024

uv 0.4.9 Homebrew/homebrew-core#185665

Merged

zanieb mentioned this pull request Sep 11, 2024

Is Python 3.13 available for uv venv? #6697

Closed

dangotbanned mentioned this pull request Sep 14, 2024

Preparing for Python 3.13 vega/altair#3587

Open

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for managed Python 3.13 and update CPython versions #7263

Add support for managed Python 3.13 and update CPython versions #7263

zanieb commented Sep 10, 2024 •

edited

Loading

zanieb Sep 10, 2024

zanieb Sep 10, 2024

zanieb Sep 10, 2024

zanieb Sep 10, 2024

zanieb Sep 10, 2024 •

edited

Loading

charliermarsh left a comment

zanieb commented Sep 10, 2024 •

edited

Loading

		cpython-(?P<ver>\d+\.\d+\.\d+?)
		cpython-(?P<ver>\d+\.\d+\.\d+(?:(?:a\|b\|rc)\d+)?)

Add support for managed Python 3.13 and update CPython versions #7263

Add support for managed Python 3.13 and update CPython versions #7263

Conversation

zanieb commented Sep 10, 2024 • edited Loading

zanieb Sep 10, 2024

Choose a reason for hiding this comment

zanieb Sep 10, 2024

Choose a reason for hiding this comment

zanieb Sep 10, 2024

Choose a reason for hiding this comment

zanieb Sep 10, 2024

Choose a reason for hiding this comment

zanieb Sep 10, 2024 • edited Loading

Choose a reason for hiding this comment

charliermarsh left a comment

Choose a reason for hiding this comment

zanieb commented Sep 10, 2024 • edited Loading

zanieb commented Sep 10, 2024 •

edited

Loading

zanieb Sep 10, 2024 •

edited

Loading

zanieb commented Sep 10, 2024 •

edited

Loading