From 2f3d26f1d9626302c372a1ddbb333920e8aadbd6 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Sat, 7 Sep 2024 14:29:47 -0400 Subject: [PATCH] Reverts --- Cargo.lock | 224 ++++++++---------- Cargo.toml | 1 - crates/uv-workspace/Cargo.toml | 1 - crates/uv-workspace/src/workspace.rs | 69 +----- projects/.python-version | 1 - projects/README.md | 0 projects/projects/product-a/project/README.md | 0 .../projects/product-a/project/pyproject.toml | 14 -- .../project/src/product_a/__init__.py | 2 - projects/projects/product-b/project/README.md | 0 .../projects/product-b/project/pyproject.toml | 14 -- .../project/src/product_b/__init__.py | 2 - projects/projects/project-a/.python-version | 1 - projects/projects/project-a/README.md | 0 projects/projects/project-a/hello.py | 6 - projects/projects/project-a/pyproject.toml | 7 - projects/pyproject.toml | 13 - projects/src/projects/__init__.py | 2 - projects/uv.lock | 24 -- .../check_installed_bird_feeder.py | 10 - .../packages/bird-feeder/pyproject.toml | 9 - .../bird-feeder/src/bird_feeder/__init__.py | 5 - .../pyproject.toml | 2 +- 23 files changed, 109 insertions(+), 298 deletions(-) delete mode 100644 projects/.python-version delete mode 100644 projects/README.md delete mode 100644 projects/projects/product-a/project/README.md delete mode 100644 projects/projects/product-a/project/pyproject.toml delete mode 100644 projects/projects/product-a/project/src/product_a/__init__.py delete mode 100644 projects/projects/product-b/project/README.md delete mode 100644 projects/projects/product-b/project/pyproject.toml delete mode 100644 projects/projects/product-b/project/src/product_b/__init__.py delete mode 100644 projects/projects/project-a/.python-version delete mode 100644 projects/projects/project-a/README.md delete mode 100644 projects/projects/project-a/hello.py delete mode 100644 projects/projects/project-a/pyproject.toml delete mode 100644 projects/pyproject.toml delete mode 100644 projects/src/projects/__init__.py delete mode 100644 projects/uv.lock delete mode 100644 scripts/workspaces/albatross-project-in-excluded/packages/bird-feeder/check_installed_bird_feeder.py delete mode 100644 scripts/workspaces/albatross-project-in-excluded/packages/bird-feeder/pyproject.toml delete mode 100644 scripts/workspaces/albatross-project-in-excluded/packages/bird-feeder/src/bird_feeder/__init__.py diff --git a/Cargo.lock b/Cargo.lock index 88332ccf7a00..8ba421b81fc8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,9 +100,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.87" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arc-swap" @@ -195,13 +195,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -471,9 +471,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" [[package]] name = "byteorder" @@ -543,9 +543,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.14" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc680c90073156fb5280c0c0127b779eef1f6292e41f7d6621acba3041e81c7d" +checksum = "14104698cb1694d43c2ff73492468ccf2bb0b047071a9838d999eeba9e984ffa" dependencies = [ "anyhow", "core-foundation", @@ -572,9 +572,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.18" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", @@ -632,9 +632,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -642,9 +642,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -655,9 +655,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.26" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0" +checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" dependencies = [ "clap", ] @@ -692,7 +692,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -712,9 +712,9 @@ dependencies = [ [[package]] name = "codspeed" -version = "2.7.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c6f324a032703f286b0fbbdb390971f914b41f3410e1615c59730e4b24ebc2" +checksum = "3a104ac948e0188b921eb3fcbdd55dcf62e542df4c7ab7e660623f6288302089" dependencies = [ "colored", "libc", @@ -723,9 +723,9 @@ dependencies = [ [[package]] name = "codspeed-criterion-compat" -version = "2.7.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae52f6f2545ffcd2ac1308f34043eb6ab81e4c741af419b348b2325574f48ee" +checksum = "722c36bdc62d9436d027256ce2627af81ac7a596dfc7d13d849d0d212448d7fe" dependencies = [ "codspeed", "colored", @@ -800,9 +800,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -926,9 +926,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.1.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1332,7 +1332,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -1624,16 +1624,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.3" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http", "hyper", "hyper-util", "rustls", - "rustls-native-certs 0.8.0", + "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", @@ -1736,9 +1736,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "insta" -version = "1.40.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", @@ -1862,9 +1862,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jiff" -version = "0.1.13" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a45489186a6123c128fdf6016183fcfab7113e1820eb813127e036e287233fb" +checksum = "362be9c702bada57298130d0565e9c389e6d4024a541692f01819e21abc3e26a" dependencies = [ "jiff-tzdb-platform", "serde", @@ -1873,15 +1873,15 @@ dependencies = [ [[package]] name = "jiff-tzdb" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91335e575850c5c4c673b9bd467b0e025f164ca59d0564f69d0c2ee0ffad4653" +checksum = "05fac328b3df1c0f18a3c2ab6cb7e06e4e549f366017d796e3e66b6d6889abe6" [[package]] name = "jiff-tzdb-platform" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9835f0060a626fe59f160437bc725491a6af23133ea906500027d1bd2f8f4329" +checksum = "f8da387d5feaf355954c2c122c194d6df9c57d865125a67984bb453db5336940" dependencies = [ "jiff-tzdb", ] @@ -2131,7 +2131,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -2329,9 +2329,9 @@ checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" [[package]] name = "parking" -version = "2.2.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -2449,9 +2449,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.12" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -2460,9 +2460,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.12" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -2470,22 +2470,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.12" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] name = "pest_meta" -version = "2.7.12" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", @@ -2525,7 +2525,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -2765,7 +2765,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -2778,7 +2778,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -2807,9 +2807,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.5" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" dependencies = [ "bytes", "pin-project-lite", @@ -2825,9 +2825,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" dependencies = [ "bytes", "rand", @@ -2842,15 +2842,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.5" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" dependencies = [ "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3089,7 +3089,7 @@ dependencies = [ "pin-project-lite", "quinn", "rustls", - "rustls-native-certs 0.7.3", + "rustls-native-certs", "rustls-pemfile", "rustls-pki-types", "serde", @@ -3174,9 +3174,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.50" +version = "0.8.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" +checksum = "09cd5a1e95672f201913966f39baf355b53b5d92833431847295ae0346a5b939" dependencies = [ "bytemuck", ] @@ -3298,9 +3298,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustix" -version = "0.38.36" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ "bitflags 2.6.0", "errno", @@ -3336,19 +3336,6 @@ dependencies = [ "security-framework", ] -[[package]] -name = "rustls-native-certs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-pemfile" version = "2.1.3" @@ -3409,11 +3396,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3438,7 +3425,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -3464,7 +3451,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -3504,22 +3491,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -3530,14 +3517,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", "memchr", @@ -3700,9 +3687,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "supports-color" -version = "3.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77" +checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f" dependencies = [ "is_ci", ] @@ -3768,9 +3755,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -3870,7 +3857,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -3881,7 +3868,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", "test-case-core", ] @@ -3903,7 +3890,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -3943,7 +3930,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -4057,7 +4044,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -4073,9 +4060,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -4100,9 +4087,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -4193,7 +4180,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -4926,7 +4913,7 @@ version = "0.0.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", "textwrap", ] @@ -5247,7 +5234,6 @@ dependencies = [ "itertools 0.13.0", "pep440_rs", "pep508_rs", - "predicates", "pypi-types", "regex", "rustc-hash", @@ -5337,7 +5323,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", "wasm-bindgen-shared", ] @@ -5371,7 +5357,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5422,9 +5408,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -5538,7 +5524,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -5549,7 +5535,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -5560,7 +5546,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -5571,7 +5557,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] @@ -5794,13 +5780,13 @@ checksum = "7d6ad6cbd9c6e5144971e326303f0e453b61d82e4f72067fccf23106bccd8437" [[package]] name = "wiremock" -version = "0.6.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fff469918e7ca034884c7fd8f93fe27bacb7fcb599fd879df6c7b429a29b646" +checksum = "6a59f8ae78a4737fb724f20106fb35ccb7cfe61ff335665d3042b3aa98e34717" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.22.1", + "base64 0.21.7", "deadpool", "futures", "http", @@ -5875,7 +5861,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.76", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1b0e4d9ee677..c11293554dbd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,6 @@ authors = ["uv"] license = "MIT OR Apache-2.0" [workspace.dependencies] -thing = { path = "foo/bar/thing" } cache-key = { path = "crates/cache-key" } distribution-filename = { path = "crates/distribution-filename" } distribution-types = { path = "crates/distribution-types" } diff --git a/crates/uv-workspace/Cargo.toml b/crates/uv-workspace/Cargo.toml index edeca1938705..5bf2183e22b9 100644 --- a/crates/uv-workspace/Cargo.toml +++ b/crates/uv-workspace/Cargo.toml @@ -42,7 +42,6 @@ itertools = { workspace = true } anyhow = { workspace = true } assert_fs = { version = "1.1.0" } insta = { version = "1.39.0", features = ["filters", "json", "redactions"] } -predicates = { version = "3.0.4" } regex = { workspace = true } tempfile = { workspace = true } diff --git a/crates/uv-workspace/src/workspace.rs b/crates/uv-workspace/src/workspace.rs index 77fc2c871779..e8e1a0871732 100644 --- a/crates/uv-workspace/src/workspace.rs +++ b/crates/uv-workspace/src/workspace.rs @@ -1546,14 +1546,14 @@ impl<'env> From<&'env VirtualProject> for InstallTarget<'env> { #[cfg(test)] #[cfg(unix)] // Avoid path escaping for the unit tests mod tests { - use insta::assert_json_snapshot; use std::env; - use std::env::temp_dir; + use std::path::Path; use anyhow::Result; use assert_fs::fixture::ChildPath; use assert_fs::prelude::*; + use insta::assert_json_snapshot; use crate::workspace::{DiscoveryOptions, ProjectWorkspace}; @@ -1575,7 +1575,7 @@ mod tests { } async fn temporary_test(folder: &Path) -> (ProjectWorkspace, String) { - let project = ProjectWorkspace::discover(&folder, &DiscoveryOptions::default()) + let project = ProjectWorkspace::discover(folder, &DiscoveryOptions::default()) .await .unwrap(); let root_escaped = regex::escape(folder.to_string_lossy().as_ref()); @@ -1672,69 +1672,6 @@ mod tests { }); } - #[tokio::test] - async fn albatross_project_excludes() { - let (project, root_escaped) = workspace_test("albatross-project-in-excluded").await; - let filters = vec![(root_escaped.as_str(), "[ROOT]")]; - insta::with_settings!({filters => filters}, { - assert_json_snapshot!( - project, - { - ".workspace.packages.*.pyproject_toml" => "[PYPROJECT_TOML]" - }, - @r###" - { - "project_root": "[ROOT]/albatross-project-in-excluded", - "project_name": "albatross", - "workspace": { - "install_path": "[ROOT]/albatross-project-in-excluded", - "packages": { - "albatross": { - "root": "[ROOT]/albatross-project-in-excluded", - "project": { - "name": "albatross", - "version": "0.1.0", - "requires-python": ">=3.12", - "optional-dependencies": null - }, - "pyproject_toml": "[PYPROJECT_TOML]" - } - }, - "sources": {}, - "pyproject_toml": { - "project": { - "name": "albatross", - "version": "0.1.0", - "requires-python": ">=3.12", - "optional-dependencies": null - }, - "tool": { - "uv": { - "sources": null, - "workspace": { - "members": [ - "packages/*" - ], - "exclude": [ - "excluded/*", - "packages/bird-feeder" - ] - }, - "managed": null, - "package": null, - "dev-dependencies": null, - "environments": null, - "override-dependencies": null, - "constraint-dependencies": null - } - } - } - } - } - "###); - }); - } - #[tokio::test] async fn albatross_root_workspace() { let (project, root_escaped) = workspace_test("albatross-root-workspace").await; diff --git a/projects/.python-version b/projects/.python-version deleted file mode 100644 index fdcfcfdfca84..000000000000 --- a/projects/.python-version +++ /dev/null @@ -1 +0,0 @@ -3.12 \ No newline at end of file diff --git a/projects/README.md b/projects/README.md deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/projects/projects/product-a/project/README.md b/projects/projects/product-a/project/README.md deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/projects/projects/product-a/project/pyproject.toml b/projects/projects/product-a/project/pyproject.toml deleted file mode 100644 index f8b33b11c783..000000000000 --- a/projects/projects/product-a/project/pyproject.toml +++ /dev/null @@ -1,14 +0,0 @@ -[project] -name = "product-a" -version = "0.1.0" -description = "Add your description here" -readme = "README.md" -requires-python = ">=3.12" -dependencies = [] - -[project.scripts] -hello = "product_a:hello" - -[build-system] -requires = ["hatchling"] -build-backend = "hatchling.build" diff --git a/projects/projects/product-a/project/src/product_a/__init__.py b/projects/projects/product-a/project/src/product_a/__init__.py deleted file mode 100644 index fa403e909ee2..000000000000 --- a/projects/projects/product-a/project/src/product_a/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -def hello(): - print("Hello from product-a!") diff --git a/projects/projects/product-b/project/README.md b/projects/projects/product-b/project/README.md deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/projects/projects/product-b/project/pyproject.toml b/projects/projects/product-b/project/pyproject.toml deleted file mode 100644 index e65e4422746f..000000000000 --- a/projects/projects/product-b/project/pyproject.toml +++ /dev/null @@ -1,14 +0,0 @@ -[project] -name = "product-b" -version = "0.1.0" -description = "Add your description here" -readme = "README.md" -requires-python = ">=3.12" -dependencies = [] - -[project.scripts] -hello = "product_b:hello" - -[build-system] -requires = ["hatchling"] -build-backend = "hatchling.build" diff --git a/projects/projects/product-b/project/src/product_b/__init__.py b/projects/projects/product-b/project/src/product_b/__init__.py deleted file mode 100644 index 6eb86663cf16..000000000000 --- a/projects/projects/product-b/project/src/product_b/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -def hello(): - print("Hello from product-b!") diff --git a/projects/projects/project-a/.python-version b/projects/projects/project-a/.python-version deleted file mode 100644 index fdcfcfdfca84..000000000000 --- a/projects/projects/project-a/.python-version +++ /dev/null @@ -1 +0,0 @@ -3.12 \ No newline at end of file diff --git a/projects/projects/project-a/README.md b/projects/projects/project-a/README.md deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/projects/projects/project-a/hello.py b/projects/projects/project-a/hello.py deleted file mode 100644 index b732683947f3..000000000000 --- a/projects/projects/project-a/hello.py +++ /dev/null @@ -1,6 +0,0 @@ -def main(): - print("Hello from project-a!") - - -if __name__ == "__main__": - main() diff --git a/projects/projects/project-a/pyproject.toml b/projects/projects/project-a/pyproject.toml deleted file mode 100644 index b844bdde9609..000000000000 --- a/projects/projects/project-a/pyproject.toml +++ /dev/null @@ -1,7 +0,0 @@ -[project] -name = "project-a" -version = "0.1.0" -description = "Add your description here" -readme = "README.md" -requires-python = ">=3.12" -dependencies = [] diff --git a/projects/pyproject.toml b/projects/pyproject.toml deleted file mode 100644 index a11828aed626..000000000000 --- a/projects/pyproject.toml +++ /dev/null @@ -1,13 +0,0 @@ -[project] -name = "projects" -version = "0.1.0" -description = "Add your description here" -requires-python = ">=3.12" -dependencies = [] - -[tool.uv] -package = false - -[tool.uv.workspace] -members = ["projects/*", "projects/product-a/*", "projects/product-b/*"] -exclude = ["projects/product-a", "projects/product-b"] diff --git a/projects/src/projects/__init__.py b/projects/src/projects/__init__.py deleted file mode 100644 index 86a4a0c54fef..000000000000 --- a/projects/src/projects/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -def hello(): - print("Hello from projects!") diff --git a/projects/uv.lock b/projects/uv.lock deleted file mode 100644 index 4c104089bda0..000000000000 --- a/projects/uv.lock +++ /dev/null @@ -1,24 +0,0 @@ -version = 1 -requires-python = ">=3.12" - -[manifest] -members = [ - "product-a", - "product-b", - "projects", -] - -[[package]] -name = "product-a" -version = "0.1.0" -source = { editable = "projects/product-a/project" } - -[[package]] -name = "product-b" -version = "0.1.0" -source = { editable = "projects/product-b/project" } - -[[package]] -name = "projects" -version = "0.1.0" -source = { virtual = "." } diff --git a/scripts/workspaces/albatross-project-in-excluded/packages/bird-feeder/check_installed_bird_feeder.py b/scripts/workspaces/albatross-project-in-excluded/packages/bird-feeder/check_installed_bird_feeder.py deleted file mode 100644 index b1dc3e72facb..000000000000 --- a/scripts/workspaces/albatross-project-in-excluded/packages/bird-feeder/check_installed_bird_feeder.py +++ /dev/null @@ -1,10 +0,0 @@ -from bird_feeder import use - -try: - from albatross import fly - - raise RuntimeError("albatross installed") -except ModuleNotFoundError: - pass - -print("Success") diff --git a/scripts/workspaces/albatross-project-in-excluded/packages/bird-feeder/pyproject.toml b/scripts/workspaces/albatross-project-in-excluded/packages/bird-feeder/pyproject.toml deleted file mode 100644 index 3caf10f0877d..000000000000 --- a/scripts/workspaces/albatross-project-in-excluded/packages/bird-feeder/pyproject.toml +++ /dev/null @@ -1,9 +0,0 @@ -[project] -name = "bird-feeder" -version = "1.0.0" -requires-python = ">=3.12" -dependencies = ["anyio>=4.3.0,<5"] - -[build-system] -requires = ["hatchling"] -build-backend = "hatchling.build" diff --git a/scripts/workspaces/albatross-project-in-excluded/packages/bird-feeder/src/bird_feeder/__init__.py b/scripts/workspaces/albatross-project-in-excluded/packages/bird-feeder/src/bird_feeder/__init__.py deleted file mode 100644 index 856404fc346d..000000000000 --- a/scripts/workspaces/albatross-project-in-excluded/packages/bird-feeder/src/bird_feeder/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -import anyio - - -def use(): - print("squirrel") diff --git a/scripts/workspaces/albatross-project-in-excluded/pyproject.toml b/scripts/workspaces/albatross-project-in-excluded/pyproject.toml index 0fc24d85f52d..8a0702e25fd5 100644 --- a/scripts/workspaces/albatross-project-in-excluded/pyproject.toml +++ b/scripts/workspaces/albatross-project-in-excluded/pyproject.toml @@ -6,7 +6,7 @@ dependencies = ["tqdm>=4,<5"] [tool.uv.workspace] members = ["packages/*"] -exclude = ["excluded/*", "packages/bird-feeder"] +exclude = ["excluded/*"] [build-system] requires = ["hatchling"]