From 4c877b7dc6f30d86bda383ffc6e67cab0e3bdafb Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Tue, 10 Jun 2025 17:03:01 -0500 Subject: [PATCH] Fix generated file change (#13957) Regressed in https://github.com/astral-sh/uv/pull/13620 ref failure at https://github.com/astral-sh/uv/actions/runs/15570991822/job/43846587900?pr=13956 --- crates/uv-cli/src/lib.rs | 6 +++--- crates/uv-settings/src/settings.rs | 2 +- docs/reference/cli.md | 6 +++--- uv.schema.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/uv-cli/src/lib.rs b/crates/uv-cli/src/lib.rs index da4524aaa..63e87367c 100644 --- a/crates/uv-cli/src/lib.rs +++ b/crates/uv-cli/src/lib.rs @@ -1491,7 +1491,7 @@ pub struct PipSyncArgs { /// Hash-checking mode introduces a number of additional constraints: /// /// - Git dependencies are not supported. - /// - Editable installs are not supported. + /// - Editable installations are not supported. /// - Local dependencies are not supported, unless they point to a specific wheel (`.whl`) or /// source archive (`.zip`, `.tar.gz`), as opposed to a directory. #[arg( @@ -1801,7 +1801,7 @@ pub struct PipInstallArgs { /// Hash-checking mode introduces a number of additional constraints: /// /// - Git dependencies are not supported. - /// - Editable installs are not supported. + /// - Editable installations are not supported. /// - Local dependencies are not supported, unless they point to a specific wheel (`.whl`) or /// source archive (`.zip`, `.tar.gz`), as opposed to a directory. #[arg( @@ -2471,7 +2471,7 @@ pub struct BuildArgs { /// Hash-checking mode introduces a number of additional constraints: /// /// - Git dependencies are not supported. - /// - Editable installs are not supported. + /// - Editable installations are not supported. /// - Local dependencies are not supported, unless they point to a specific wheel (`.whl`) or /// source archive (`.zip`, `.tar.gz`), as opposed to a directory. #[arg( diff --git a/crates/uv-settings/src/settings.rs b/crates/uv-settings/src/settings.rs index 7c2406d0c..ff6d39995 100644 --- a/crates/uv-settings/src/settings.rs +++ b/crates/uv-settings/src/settings.rs @@ -1495,7 +1495,7 @@ pub struct PipOptions { /// Hash-checking mode introduces a number of additional constraints: /// /// - Git dependencies are not supported. - /// - Editable installs are not supported. + /// - Editable installations are not supported. /// - Local dependencies are not supported, unless they point to a specific wheel (`.whl`) or /// source archive (`.zip`, `.tar.gz`), as opposed to a directory. #[option( diff --git a/docs/reference/cli.md b/docs/reference/cli.md index d89d4498e..aef894368 100644 --- a/docs/reference/cli.md +++ b/docs/reference/cli.md @@ -3550,7 +3550,7 @@ be used with caution, as it can modify the system Python installation.

When --require-hashes is enabled, all requirements must include a hash or set of hashes, and all requirements must either be pinned to exact versions (e.g., ==1.0.0), or be specified via direct URL.

Hash-checking mode introduces a number of additional constraints:

May also be set with the UV_REQUIRE_HASHES environment variable.

--strict

Validate the Python environment after completing the installation, to detect packages with missing dependencies or other issues

--system

Install packages into the system Python environment.

@@ -3814,7 +3814,7 @@ should be used with caution, as it can modify the system Python installation.

When --require-hashes is enabled, all requirements must include a hash or set of hashes, and all requirements must either be pinned to exact versions (e.g., ==1.0.0), or be specified via direct URL.

Hash-checking mode introduces a number of additional constraints:

May also be set with the UV_REQUIRE_HASHES environment variable.

--requirements, --requirement, -r requirements

Install all packages listed in the given requirements.txt or pylock.toml files.

If a pyproject.toml, setup.py, or setup.cfg file is provided, uv will extract the requirements for the relevant project.

@@ -4676,7 +4676,7 @@ the platform.

When --require-hashes is enabled, all requirements must include a hash or set of hashes, and all requirements must either be pinned to exact versions (e.g., ==1.0.0), or be specified via direct URL.

Hash-checking mode introduces a number of additional constraints:

May also be set with the UV_REQUIRE_HASHES environment variable.

--resolution resolution

The strategy to use when selecting between the different compatible versions for a given package requirement.

By default, uv will use the latest compatible version of each package (highest).

diff --git a/uv.schema.json b/uv.schema.json index 19a6bf4bd..d2ca69f20 100644 --- a/uv.schema.json +++ b/uv.schema.json @@ -1498,7 +1498,7 @@ } }, "require-hashes": { - "description": "Require a matching hash for each requirement.\n\nHash-checking mode is all or nothing. If enabled, _all_ requirements must be provided with a corresponding hash or set of hashes. Additionally, if enabled, _all_ requirements must either be pinned to exact versions (e.g., `==1.0.0`), or be specified via direct URL.\n\nHash-checking mode introduces a number of additional constraints:\n\n- Git dependencies are not supported. - Editable installs are not supported. - Local dependencies are not supported, unless they point to a specific wheel (`.whl`) or source archive (`.zip`, `.tar.gz`), as opposed to a directory.", + "description": "Require a matching hash for each requirement.\n\nHash-checking mode is all or nothing. If enabled, _all_ requirements must be provided with a corresponding hash or set of hashes. Additionally, if enabled, _all_ requirements must either be pinned to exact versions (e.g., `==1.0.0`), or be specified via direct URL.\n\nHash-checking mode introduces a number of additional constraints:\n\n- Git dependencies are not supported. - Editable installations are not supported. - Local dependencies are not supported, unless they point to a specific wheel (`.whl`) or source archive (`.zip`, `.tar.gz`), as opposed to a directory.", "type": [ "boolean", "null"