diff --git a/CHANGELOG.md b/CHANGELOG.md index 7062497ef..b93d8fdb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1417,7 +1417,7 @@ and `uv tool run` ([#4404](https://github.com/astral-sh/uv/pull/4404)) - Add `--workspace` option to `uv add` ([#4362](https://github.com/astral-sh/uv/pull/4362)) - Ignore query errors during `uv toolchain list` ([#4382](https://github.com/astral-sh/uv/pull/4382)) -- Respect `.python-version` files and fetch manged toolchains in uv project +- Respect `.python-version` files and fetch managed toolchains in uv project commands ([#4361](https://github.com/astral-sh/uv/pull/4361)) - Respect `.python-version` in `uv venv --preview` ([#4360](https://github.com/astral-sh/uv/pull/4360)) diff --git a/crates/uv-cli/src/lib.rs b/crates/uv-cli/src/lib.rs index fc0cb5bf7..7e4a72101 100644 --- a/crates/uv-cli/src/lib.rs +++ b/crates/uv-cli/src/lib.rs @@ -995,7 +995,7 @@ pub struct PipCompileArgs { /// /// Represented as a "target triple", a string that describes the target platform in terms of /// its CPU, vendor, and operating system name, like `x86_64-unknown-linux-gnu` or - /// `aaarch64-apple-darwin`. + /// `aarch64-apple-darwin`. #[arg(long)] pub python_platform: Option, @@ -1278,7 +1278,7 @@ pub struct PipSyncArgs { /// /// Represented as a "target triple", a string that describes the target platform in terms of /// its CPU, vendor, and operating system name, like `x86_64-unknown-linux-gnu` or - /// `aaarch64-apple-darwin`. + /// `aarch64-apple-darwin`. /// /// WARNING: When specified, uv will select wheels that are compatible with the _target_ /// platform; as a result, the installed distributions may not be compatible with the _current_ @@ -1553,7 +1553,7 @@ pub struct PipInstallArgs { /// /// Represented as a "target triple", a string that describes the target platform in terms of /// its CPU, vendor, and operating system name, like `x86_64-unknown-linux-gnu` or - /// `aaarch64-apple-darwin`. + /// `aarch64-apple-darwin`. /// /// WARNING: When specified, uv will select wheels that are compatible with the _target_ /// platform; as a result, the installed distributions may not be compatible with the _current_ @@ -2899,7 +2899,7 @@ pub struct TreeArgs { /// /// Represented as a "target triple", a string that describes the target /// platform in terms of its CPU, vendor, and operating system name, like - /// `x86_64-unknown-linux-gnu` or `aaarch64-apple-darwin`. + /// `x86_64-unknown-linux-gnu` or `aarch64-apple-darwin`. #[arg(long, conflicts_with = "universal")] pub python_platform: Option, diff --git a/crates/uv-settings/src/settings.rs b/crates/uv-settings/src/settings.rs index a4ead9181..7e3b1649e 100644 --- a/crates/uv-settings/src/settings.rs +++ b/crates/uv-settings/src/settings.rs @@ -1012,7 +1012,7 @@ pub struct PipOptions { /// /// Represented as a "target triple", a string that describes the target platform in terms of /// its CPU, vendor, and operating system name, like `x86_64-unknown-linux-gnu` or - /// `aaarch64-apple-darwin`. + /// `aarch64-apple-darwin`. #[option( default = "None", value_type = "str", diff --git a/crates/uv/tests/pip_compile.rs b/crates/uv/tests/pip_compile.rs index 98e9fa9ed..c4236922c 100644 --- a/crates/uv/tests/pip_compile.rs +++ b/crates/uv/tests/pip_compile.rs @@ -8247,7 +8247,7 @@ fn universal_unnecessary_python() -> Result<()> { /// on the marker environment. This is usually fine, except in this case, /// `torchvision` has an unconditional dependency on `torch`, and this resulted /// in the markers being dropped. As a result, we'd previously write a -/// `requirements.txt` file that unconditionally dependended on two different +/// `requirements.txt` file that unconditionally depended on two different /// versions of `torch`. /// /// See: diff --git a/crates/uv/tests/sync.rs b/crates/uv/tests/sync.rs index 18cb5f7af..a67dc1aa0 100644 --- a/crates/uv/tests/sync.rs +++ b/crates/uv/tests/sync.rs @@ -744,7 +744,7 @@ fn sync_build_isolation_extra() -> Result<()> { /// Avoid using incompatible versions for build dependencies that are also part of the resolved /// environment. This is a very subtle issue, but: when locking, we don't enforce platform /// compatibility. So, if we reuse the resolver state to install, and the install itself has to -/// preform a resolution (e.g., for the build dependencies of a source distribution), that +/// perform a resolution (e.g., for the build dependencies of a source distribution), that /// resolution may choose incompatible versions. /// /// The key property here is that there's a shared package between the build dependencies and the diff --git a/docs/reference/cli.md b/docs/reference/cli.md index 0c8ee71f2..214e13b0e 100644 --- a/docs/reference/cli.md +++ b/docs/reference/cli.md @@ -2182,7 +2182,7 @@ uv tree [OPTIONS]

For example, pass --platform windows to display the dependencies that would be included when installing on Windows.

-

Represented as a "target triple", a string that describes the target platform in terms of its CPU, vendor, and operating system name, like x86_64-unknown-linux-gnu or aaarch64-apple-darwin.

+

Represented as a "target triple", a string that describes the target platform in terms of its CPU, vendor, and operating system name, like x86_64-unknown-linux-gnu or aarch64-apple-darwin.

Possible values:

@@ -4469,7 +4469,7 @@ uv pip compile [OPTIONS] ...
--python-platform python-platform

The platform for which requirements should be resolved.

-

Represented as a "target triple", a string that describes the target platform in terms of its CPU, vendor, and operating system name, like x86_64-unknown-linux-gnu or aaarch64-apple-darwin.

+

Represented as a "target triple", a string that describes the target platform in terms of its CPU, vendor, and operating system name, like x86_64-unknown-linux-gnu or aarch64-apple-darwin.

Possible values:

@@ -4791,7 +4791,7 @@ uv pip sync [OPTIONS] ...

May also be set with the UV_PYTHON environment variable.

--python-platform python-platform

The platform for which requirements should be installed.

-

Represented as a "target triple", a string that describes the target platform in terms of its CPU, vendor, and operating system name, like x86_64-unknown-linux-gnu or aaarch64-apple-darwin.

+

Represented as a "target triple", a string that describes the target platform in terms of its CPU, vendor, and operating system name, like x86_64-unknown-linux-gnu or aarch64-apple-darwin.

WARNING: When specified, uv will select wheels that are compatible with the target platform; as a result, the installed distributions may not be compatible with the current platform. Conversely, any distributions that are built from source may be incompatible with the target platform, as they will be built for the current platform. The --python-platform option is intended for advanced use cases.

@@ -5153,7 +5153,7 @@ uv pip install [OPTIONS] |--editable May also be set with the UV_PYTHON environment variable.

--python-platform python-platform

The platform for which requirements should be installed.

-

Represented as a "target triple", a string that describes the target platform in terms of its CPU, vendor, and operating system name, like x86_64-unknown-linux-gnu or aaarch64-apple-darwin.

+

Represented as a "target triple", a string that describes the target platform in terms of its CPU, vendor, and operating system name, like x86_64-unknown-linux-gnu or aarch64-apple-darwin.

WARNING: When specified, uv will select wheels that are compatible with the target platform; as a result, the installed distributions may not be compatible with the current platform. Conversely, any distributions that are built from source may be incompatible with the target platform, as they will be built for the current platform. The --python-platform option is intended for advanced use cases.

diff --git a/docs/reference/settings.md b/docs/reference/settings.md index e35330848..0fe5287a1 100644 --- a/docs/reference/settings.md +++ b/docs/reference/settings.md @@ -2361,7 +2361,7 @@ The platform for which requirements should be resolved. Represented as a "target triple", a string that describes the target platform in terms of its CPU, vendor, and operating system name, like `x86_64-unknown-linux-gnu` or -`aaarch64-apple-darwin`. +`aarch64-apple-darwin`. **Default value**: `None` diff --git a/uv.schema.json b/uv.schema.json index d983c13e4..07867fe9e 100644 --- a/uv.schema.json +++ b/uv.schema.json @@ -894,7 +894,7 @@ ] }, "python-platform": { - "description": "The platform for which requirements should be resolved.\n\nRepresented as a \"target triple\", a string that describes the target platform in terms of its CPU, vendor, and operating system name, like `x86_64-unknown-linux-gnu` or `aaarch64-apple-darwin`.", + "description": "The platform for which requirements should be resolved.\n\nRepresented as a \"target triple\", a string that describes the target platform in terms of its CPU, vendor, and operating system name, like `x86_64-unknown-linux-gnu` or `aarch64-apple-darwin`.", "anyOf": [ { "$ref": "#/definitions/TargetTriple"