From a08d1802b569630f4e483b2c6b53292f3c8d41c8 Mon Sep 17 00:00:00 2001 From: CodeMan62 Date: Thu, 19 Jun 2025 16:44:48 +0530 Subject: [PATCH] slight changes --- crates/uv-scripts/src/lib.rs | 1 + crates/uv-settings/src/settings.rs | 6 ++++++ crates/uv-workspace/src/workspace.rs | 2 +- crates/uv/tests/it/lock.rs | 2 -- crates/uv/tests/it/show_settings.rs | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/crates/uv-scripts/src/lib.rs b/crates/uv-scripts/src/lib.rs index 1023b4141..498ceff20 100644 --- a/crates/uv-scripts/src/lib.rs +++ b/crates/uv-scripts/src/lib.rs @@ -364,6 +364,7 @@ pub struct ToolUv { #[serde(flatten)] pub top_level: ResolverInstallerOptions, pub override_dependencies: Option>>, + pub excluded_dependencies: Option>>, pub constraint_dependencies: Option>>, pub build_constraint_dependencies: Option>>, pub sources: Option>, diff --git a/crates/uv-settings/src/settings.rs b/crates/uv-settings/src/settings.rs index 2c18fb40a..2df119661 100644 --- a/crates/uv-settings/src/settings.rs +++ b/crates/uv-settings/src/settings.rs @@ -110,6 +110,9 @@ pub struct Options { #[cfg_attr(feature = "schemars", schemars(skip))] pub override_dependencies: Option>>, + #[cfg_attr(feature = "schemars", schemars(skip))] + pub excluded_dependencies: Option>>, + #[cfg_attr(feature = "schemars", schemars(skip))] pub constraint_dependencies: Option>>, @@ -1859,6 +1862,7 @@ pub struct OptionsWire { // `crates/uv-workspace/src/pyproject.rs`. The documentation lives on that struct. // They're respected in both `pyproject.toml` and `uv.toml` files. override_dependencies: Option>>, + excluded_dependencies: Option>>, constraint_dependencies: Option>>, build_constraint_dependencies: Option>>, environments: Option, @@ -1927,6 +1931,7 @@ impl From for Options { pip, cache_keys, override_dependencies, + excluded_dependencies, constraint_dependencies, build_constraint_dependencies, environments, @@ -1995,6 +2000,7 @@ impl From for Options { cache_keys, build_backend, override_dependencies, + excluded_dependencies, constraint_dependencies, build_constraint_dependencies, environments, diff --git a/crates/uv-workspace/src/workspace.rs b/crates/uv-workspace/src/workspace.rs index e19ab2c91..d74a74baa 100644 --- a/crates/uv-workspace/src/workspace.rs +++ b/crates/uv-workspace/src/workspace.rs @@ -2178,8 +2178,8 @@ mod tests { "default-groups": null, "dependency-groups": null, "dev-dependencies": null, - "excluded-dependencies": null, "override-dependencies": null, + "excluded-dependencies": null, "constraint-dependencies": null, "build-constraint-dependencies": null, "environments": null, diff --git a/crates/uv/tests/it/lock.rs b/crates/uv/tests/it/lock.rs index 73d4cb908..2e6acf91f 100644 --- a/crates/uv/tests/it/lock.rs +++ b/crates/uv/tests/it/lock.rs @@ -3746,8 +3746,6 @@ fn lock_requires_python() -> Result<()> { And because we know from (1) that pygls>=1.1.0,<1.3.0 cannot be used, we can conclude that pygls>=1.1.0 cannot be used. And because your project depends on pygls>=1.1.0, we can conclude that your project's requirements are unsatisfiable. - hint: Pre-releases are available for `pygls` in the requested range (e.g., 2.0.0a4), but pre-releases weren't enabled (try: `--prerelease=allow`) - hint: The `requires-python` value (>=3.7) includes Python versions that are not supported by your dependencies (e.g., pygls>=1.1.0,<=1.2.1 only supports >=3.7.9, <4). Consider using a more restrictive `requires-python` value (like >=3.7.9, <4). hint: While the active Python version is 3.12, the resolution failed for other Python versions supported by your project. Consider limiting your project's supported Python versions using `requires-python`. diff --git a/crates/uv/tests/it/show_settings.rs b/crates/uv/tests/it/show_settings.rs index 7635bd523..2d9f967d3 100644 --- a/crates/uv/tests/it/show_settings.rs +++ b/crates/uv/tests/it/show_settings.rs @@ -3987,7 +3987,7 @@ fn resolve_config_file() -> anyhow::Result<()> { | 1 | [project] | ^^^^^^^ - unknown field `project`, expected one of `required-version`, `native-tls`, `offline`, `no-cache`, `cache-dir`, `preview`, `python-preference`, `python-downloads`, `concurrent-downloads`, `concurrent-builds`, `concurrent-installs`, `index`, `index-url`, `extra-index-url`, `no-index`, `find-links`, `index-strategy`, `keyring-provider`, `allow-insecure-host`, `resolution`, `prerelease`, `fork-strategy`, `dependency-metadata`, `config-settings`, `no-build-isolation`, `no-build-isolation-package`, `exclude-newer`, `link-mode`, `compile-bytecode`, `no-sources`, `upgrade`, `upgrade-package`, `reinstall`, `reinstall-package`, `no-build`, `no-build-package`, `no-binary`, `no-binary-package`, `python-install-mirror`, `pypy-install-mirror`, `python-downloads-json-url`, `publish-url`, `trusted-publishing`, `check-url`, `add-bounds`, `pip`, `cache-keys`, `override-dependencies`, `constraint-dependencies`, `build-constraint-dependencies`, `environments`, `required-environments`, `conflicts`, `workspace`, `sources`, `managed`, `package`, `default-groups`, `dependency-groups`, `dev-dependencies`, `build-backend` + unknown field `project`, expected one of `required-version`, `native-tls`, `offline`, `no-cache`, `cache-dir`, `preview`, `python-preference`, `python-downloads`, `concurrent-downloads`, `concurrent-builds`, `concurrent-installs`, `index`, `index-url`, `extra-index-url`, `no-index`, `find-links`, `index-strategy`, `keyring-provider`, `allow-insecure-host`, `resolution`, `prerelease`, `fork-strategy`, `dependency-metadata`, `config-settings`, `no-build-isolation`, `no-build-isolation-package`, `exclude-newer`, `link-mode`, `compile-bytecode`, `no-sources`, `upgrade`, `upgrade-package`, `reinstall`, `reinstall-package`, `no-build`, `no-build-package`, `no-binary`, `no-binary-package`, `python-install-mirror`, `pypy-install-mirror`, `python-downloads-json-url`, `publish-url`, `trusted-publishing`, `check-url`, `add-bounds`, `pip`, `cache-keys`, `override-dependencies`, `excluded-dependencies`, `constraint-dependencies`, `build-constraint-dependencies`, `environments`, `required-environments`, `conflicts`, `workspace`, `sources`, `managed`, `package`, `default-groups`, `dependency-groups`, `dev-dependencies`, `build-backend` " );