diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7f3202aa..9fbdc8b52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2064,22 +2064,22 @@ jobs: # Test the main path (`build_wheel`) through pip ./uv venv -v --seed - ./uv run --no-project python -m pip install -v scripts/packages/built-by-uv --find-links crates/uv-build/dist --no-index --no-deps + ./uv run --no-project python -m pip install -v test/packages/built-by-uv --find-links crates/uv-build/dist --no-index --no-deps ./uv run --no-project python -c "from built_by_uv import greet; print(greet())" # Test both `build_wheel` and `build_sdist` through uv ./uv venv -c -v - ./uv build -v --force-pep517 scripts/packages/built-by-uv --find-links crates/uv-build/dist --offline - ./uv pip install -v scripts/packages/built-by-uv/dist/*.tar.gz --find-links crates/uv-build/dist --offline --no-deps + ./uv build -v --force-pep517 test/packages/built-by-uv --find-links crates/uv-build/dist --offline + ./uv pip install -v test/packages/built-by-uv/dist/*.tar.gz --find-links crates/uv-build/dist --offline --no-deps ./uv run --no-project python -c "from built_by_uv import greet; print(greet())" # Test both `build_wheel` and `build_sdist` through the official `build` - rm -rf scripts/packages/built-by-uv/dist/ + rm -rf test/packages/built-by-uv/dist/ ./uv venv -c -v ./uv pip install build # Add the uv binary to PATH for `build` to find - PATH="$(pwd):$PATH" UV_OFFLINE=1 UV_FIND_LINKS=crates/uv-build/dist ./uv run --no-project python -m build -v --installer uv scripts/packages/built-by-uv - ./uv pip install -v scripts/packages/built-by-uv/dist/*.tar.gz --find-links crates/uv-build/dist --offline --no-deps + PATH="$(pwd):$PATH" UV_OFFLINE=1 UV_FIND_LINKS=crates/uv-build/dist ./uv run --no-project python -m build -v --installer uv test/packages/built-by-uv + ./uv pip install -v test/packages/built-by-uv/dist/*.tar.gz --find-links crates/uv-build/dist --offline --no-deps ./uv run --no-project python -c "from built_by_uv import greet; print(greet())" cache-test-ubuntu: @@ -2943,8 +2943,8 @@ jobs: sudo apt-get update sudo apt-get install -y libsasl2-dev libldap2-dev libkrb5-dev cargo run --bin uv -- venv --cache-dir .cache - cargo run --bin uv -- pip compile scripts/requirements/jupyter.in --universal --exclude-newer 2024-08-08 --cache-dir .cache - cargo run --bin uv -- pip compile scripts/requirements/airflow.in --universal --exclude-newer 2024-08-08 --cache-dir .cache + cargo run --bin uv -- pip compile test/requirements/jupyter.in --universal --exclude-newer 2024-08-08 --cache-dir .cache + cargo run --bin uv -- pip compile test/requirements/airflow.in --universal --exclude-newer 2024-08-08 --cache-dir .cache - name: "Build benchmarks" run: cargo codspeed build --profile profiling -p uv-bench @@ -2983,8 +2983,8 @@ jobs: sudo apt-get update sudo apt-get install -y libsasl2-dev libldap2-dev libkrb5-dev cargo run --bin uv -- venv --cache-dir .cache - cargo run --bin uv -- pip compile scripts/requirements/jupyter.in --universal --exclude-newer 2024-08-08 --cache-dir .cache - cargo run --bin uv -- pip compile scripts/requirements/airflow.in --universal --exclude-newer 2024-08-08 --cache-dir .cache + cargo run --bin uv -- pip compile test/requirements/jupyter.in --universal --exclude-newer 2024-08-08 --cache-dir .cache + cargo run --bin uv -- pip compile test/requirements/airflow.in --universal --exclude-newer 2024-08-08 --cache-dir .cache - name: "Build benchmarks" run: cargo codspeed build --profile profiling -p uv-bench diff --git a/.prettierignore b/.prettierignore index 1f89dc11b..e41106675 100644 --- a/.prettierignore +++ b/.prettierignore @@ -4,5 +4,5 @@ PREVIEW-CHANGELOG.md docs/reference/cli.md docs/reference/settings.md docs/reference/environment.md -ecosystem/home-assistant-core/LICENSE.md +test/ecosystem/home-assistant-core/LICENSE.md docs/guides/integration/gitlab.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 30d6f1932..eeca2fb6f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -127,7 +127,7 @@ Please refer to Ruff's it applies to uv, too. We provide diverse sets of requirements for testing and benchmarking the resolver in -`scripts/requirements` and for the installer in `scripts/requirements/compiled`. +`test/requirements` and for the installer in `test/requirements/compiled`. You can use `scripts/benchmark` to benchmark predefined workloads between uv versions and with other tools, e.g., from the `scripts/benchmark` directory: @@ -138,7 +138,7 @@ uv run resolver \ --poetry \ --benchmark \ resolve-cold \ - ../scripts/requirements/trio.in + ../test/requirements/trio.in ``` ### Analyzing concurrency @@ -148,7 +148,7 @@ visualize parallel requests and find any spots where uv is CPU-bound. Example us `uv-dev` respectively: ```shell -RUST_LOG=uv=info TRACING_DURATIONS_FILE=target/traces/jupyter.ndjson cargo run --features tracing-durations-export --profile profiling -- pip compile scripts/requirements/jupyter.in +RUST_LOG=uv=info TRACING_DURATIONS_FILE=target/traces/jupyter.ndjson cargo run --features tracing-durations-export --profile profiling -- pip compile test/requirements/jupyter.in ``` ```shell diff --git a/_typos.toml b/_typos.toml index 4af054d17..b7b51e6aa 100644 --- a/_typos.toml +++ b/_typos.toml @@ -1,8 +1,8 @@ [files] extend-exclude = [ "**/snapshots/", - "ecosystem/**", - "scripts/**/*.in", + "test/ecosystem/**", + "test/requirements/**/*.in", "crates/uv-build-frontend/src/pipreqs/mapping", ] ignore-hidden = false diff --git a/crates/uv-build-backend/src/lib.rs b/crates/uv-build-backend/src/lib.rs index 01f7de2b1..c9dc4e6d2 100644 --- a/crates/uv-build-backend/src/lib.rs +++ b/crates/uv-build-backend/src/lib.rs @@ -599,7 +599,7 @@ mod tests { /// platform-independent deterministic builds. #[test] fn built_by_uv_building() { - let built_by_uv = Path::new("../../scripts/packages/built-by-uv"); + let built_by_uv = Path::new("../../test/packages/built-by-uv"); let src = TempDir::new().unwrap(); for dir in [ "src", diff --git a/crates/uv-build-backend/src/wheel.rs b/crates/uv-build-backend/src/wheel.rs index dd072fabf..5d60e32f0 100644 --- a/crates/uv-build-backend/src/wheel.rs +++ b/crates/uv-build-backend/src/wheel.rs @@ -840,7 +840,7 @@ mod test { #[test] fn test_prepare_metadata() { let metadata_dir = TempDir::new().unwrap(); - let built_by_uv = Path::new("../../scripts/packages/built-by-uv"); + let built_by_uv = Path::new("../../test/packages/built-by-uv"); metadata(built_by_uv, metadata_dir.path(), "1.0.0+test").unwrap(); let mut files: Vec<_> = WalkDir::new(metadata_dir.path()) diff --git a/crates/uv-publish/src/lib.rs b/crates/uv-publish/src/lib.rs index 207ceb952..c2c46062a 100644 --- a/crates/uv-publish/src/lib.rs +++ b/crates/uv-publish/src/lib.rs @@ -1441,7 +1441,7 @@ mod tests { async fn upload_request_source_dist() { let group = { let raw_filename = "tqdm-999.0.0.tar.gz"; - let file = PathBuf::from("../../scripts/links/").join(raw_filename); + let file = PathBuf::from("../../test/links/").join(raw_filename); let filename = DistFilename::try_from_normalized_filename(raw_filename).unwrap(); UploadDistribution { @@ -1563,7 +1563,7 @@ mod tests { async fn upload_request_wheel() { let group = { let raw_filename = "tqdm-4.66.1-py3-none-manylinux_2_12_x86_64.manylinux2010_x86_64.musllinux_1_1_x86_64.whl"; - let file = PathBuf::from("../../scripts/links/").join(raw_filename); + let file = PathBuf::from("../../test/links/").join(raw_filename); let filename = DistFilename::try_from_normalized_filename(raw_filename).unwrap(); UploadDistribution { diff --git a/crates/uv-requirements-txt/src/snapshots/uv_requirements_txt__test__parse-unix-bare-url.txt.snap b/crates/uv-requirements-txt/src/snapshots/uv_requirements_txt__test__parse-unix-bare-url.txt.snap index dd03d09bf..aedadf5c3 100644 --- a/crates/uv-requirements-txt/src/snapshots/uv_requirements_txt__test__parse-unix-bare-url.txt.snap +++ b/crates/uv-requirements-txt/src/snapshots/uv_requirements_txt__test__parse-unix-bare-url.txt.snap @@ -17,11 +17,11 @@ RequirementsTxt { password: None, host: None, port: None, - path: "/scripts/packages/black_editable", + path: "/test/packages/black_editable", query: None, fragment: None, }, - install_path: "/scripts/packages/black_editable", + install_path: "/test/packages/black_editable", editable: None, virtual: None, }, @@ -34,12 +34,12 @@ RequirementsTxt { password: None, host: None, port: None, - path: "/scripts/packages/black_editable", + path: "/test/packages/black_editable", query: None, fragment: None, }, given: Some( - "./scripts/packages/black_editable", + "./test/packages/black_editable", ), }, }, @@ -67,11 +67,11 @@ RequirementsTxt { password: None, host: None, port: None, - path: "/scripts/packages/black_editable", + path: "/test/packages/black_editable", query: None, fragment: None, }, - install_path: "/scripts/packages/black_editable", + install_path: "/test/packages/black_editable", editable: None, virtual: None, }, @@ -84,12 +84,12 @@ RequirementsTxt { password: None, host: None, port: None, - path: "/scripts/packages/black_editable", + path: "/test/packages/black_editable", query: None, fragment: None, }, given: Some( - "./scripts/packages/black_editable", + "./test/packages/black_editable", ), }, }, @@ -121,11 +121,11 @@ RequirementsTxt { password: None, host: None, port: None, - path: "/scripts/packages/black_editable", + path: "/test/packages/black_editable", query: None, fragment: None, }, - install_path: "/scripts/packages/black_editable", + install_path: "/test/packages/black_editable", editable: None, virtual: None, }, @@ -138,12 +138,12 @@ RequirementsTxt { password: None, host: None, port: None, - path: "/scripts/packages/black_editable", + path: "/test/packages/black_editable", query: None, fragment: None, }, given: Some( - "file:///scripts/packages/black_editable", + "file:///test/packages/black_editable", ), }, }, @@ -171,11 +171,11 @@ RequirementsTxt { password: None, host: None, port: None, - path: "/scripts/packages/black%20editable", + path: "/test/packages/black%20editable", query: None, fragment: None, }, - install_path: "/scripts/packages/black editable", + install_path: "/test/packages/black editable", editable: None, virtual: None, }, @@ -188,12 +188,12 @@ RequirementsTxt { password: None, host: None, port: None, - path: "/scripts/packages/black%20editable", + path: "/test/packages/black%20editable", query: None, fragment: None, }, given: Some( - "./scripts/packages/black editable", + "./test/packages/black editable", ), }, }, @@ -221,11 +221,11 @@ RequirementsTxt { password: None, host: None, port: None, - path: "/scripts/packages/black%20editable", + path: "/test/packages/black%20editable", query: None, fragment: None, }, - install_path: "/scripts/packages/black editable", + install_path: "/test/packages/black editable", editable: None, virtual: None, }, @@ -238,12 +238,12 @@ RequirementsTxt { password: None, host: None, port: None, - path: "/scripts/packages/black%20editable", + path: "/test/packages/black%20editable", query: None, fragment: None, }, given: Some( - "./scripts/packages/black editable", + "./test/packages/black editable", ), }, }, @@ -271,11 +271,11 @@ RequirementsTxt { password: None, host: None, port: None, - path: "/scripts/packages/black%20editable", + path: "/test/packages/black%20editable", query: None, fragment: None, }, - install_path: "/scripts/packages/black editable", + install_path: "/test/packages/black editable", editable: None, virtual: None, }, @@ -288,12 +288,12 @@ RequirementsTxt { password: None, host: None, port: None, - path: "/scripts/packages/black%20editable", + path: "/test/packages/black%20editable", query: None, fragment: None, }, given: Some( - "./scripts/packages/black editable", + "./test/packages/black editable", ), }, }, diff --git a/crates/uv-requirements-txt/src/snapshots/uv_requirements_txt__test__parse-windows-bare-url.txt.snap b/crates/uv-requirements-txt/src/snapshots/uv_requirements_txt__test__parse-windows-bare-url.txt.snap index be90c5c44..e66f40774 100644 --- a/crates/uv-requirements-txt/src/snapshots/uv_requirements_txt__test__parse-windows-bare-url.txt.snap +++ b/crates/uv-requirements-txt/src/snapshots/uv_requirements_txt__test__parse-windows-bare-url.txt.snap @@ -17,11 +17,11 @@ RequirementsTxt { password: None, host: None, port: None, - path: "//scripts/packages/black_editable", + path: "//test/packages/black_editable", query: None, fragment: None, }, - install_path: "/scripts/packages/black_editable", + install_path: "/test/packages/black_editable", editable: None, virtual: None, }, @@ -34,12 +34,12 @@ RequirementsTxt { password: None, host: None, port: None, - path: "//scripts/packages/black_editable", + path: "//test/packages/black_editable", query: None, fragment: None, }, given: Some( - "./scripts/packages/black_editable", + "./test/packages/black_editable", ), }, }, @@ -67,11 +67,11 @@ RequirementsTxt { password: None, host: None, port: None, - path: "//scripts/packages/black_editable", + path: "//test/packages/black_editable", query: None, fragment: None, }, - install_path: "/scripts/packages/black_editable", + install_path: "/test/packages/black_editable", editable: None, virtual: None, }, @@ -84,12 +84,12 @@ RequirementsTxt { password: None, host: None, port: None, - path: "//scripts/packages/black_editable", + path: "//test/packages/black_editable", query: None, fragment: None, }, given: Some( - "./scripts/packages/black_editable", + "./test/packages/black_editable", ), }, }, @@ -121,11 +121,11 @@ RequirementsTxt { password: None, host: None, port: None, - path: "//scripts/packages/black_editable", + path: "//test/packages/black_editable", query: None, fragment: None, }, - install_path: "/scripts/packages/black_editable", + install_path: "/test/packages/black_editable", editable: None, virtual: None, }, @@ -138,12 +138,12 @@ RequirementsTxt { password: None, host: None, port: None, - path: "//scripts/packages/black_editable", + path: "//test/packages/black_editable", query: None, fragment: None, }, given: Some( - "file:///scripts/packages/black_editable", + "file:///test/packages/black_editable", ), }, }, @@ -171,11 +171,11 @@ RequirementsTxt { password: None, host: None, port: None, - path: "//scripts/packages/black%20editable", + path: "//test/packages/black%20editable", query: None, fragment: None, }, - install_path: "/scripts/packages/black editable", + install_path: "/test/packages/black editable", editable: None, virtual: None, }, @@ -188,12 +188,12 @@ RequirementsTxt { password: None, host: None, port: None, - path: "//scripts/packages/black%20editable", + path: "//test/packages/black%20editable", query: None, fragment: None, }, given: Some( - "./scripts/packages/black editable", + "./test/packages/black editable", ), }, }, @@ -221,11 +221,11 @@ RequirementsTxt { password: None, host: None, port: None, - path: "//scripts/packages/black%20editable", + path: "//test/packages/black%20editable", query: None, fragment: None, }, - install_path: "/scripts/packages/black editable", + install_path: "/test/packages/black editable", editable: None, virtual: None, }, @@ -238,12 +238,12 @@ RequirementsTxt { password: None, host: None, port: None, - path: "//scripts/packages/black%20editable", + path: "//test/packages/black%20editable", query: None, fragment: None, }, given: Some( - "./scripts/packages/black editable", + "./test/packages/black editable", ), }, }, @@ -271,11 +271,11 @@ RequirementsTxt { password: None, host: None, port: None, - path: "//scripts/packages/black%20editable", + path: "//test/packages/black%20editable", query: None, fragment: None, }, - install_path: "/scripts/packages/black editable", + install_path: "/test/packages/black editable", editable: None, virtual: None, }, @@ -288,12 +288,12 @@ RequirementsTxt { password: None, host: None, port: None, - path: "//scripts/packages/black%20editable", + path: "//test/packages/black%20editable", query: None, fragment: None, }, given: Some( - "./scripts/packages/black editable", + "./test/packages/black editable", ), }, }, diff --git a/crates/uv-requirements-txt/test-data/requirements-txt/bare-url.txt b/crates/uv-requirements-txt/test-data/requirements-txt/bare-url.txt index 2fef7fd16..16d120e4d 100644 --- a/crates/uv-requirements-txt/test-data/requirements-txt/bare-url.txt +++ b/crates/uv-requirements-txt/test-data/requirements-txt/bare-url.txt @@ -1,6 +1,6 @@ -./scripts/packages/black_editable -./scripts/packages/black_editable[dev] -file:///scripts/packages/black_editable -./scripts/packages/black editable -./scripts/packages/black editable ; python_version >= "3.9" -./scripts/packages/black editable # comment +./test/packages/black_editable +./test/packages/black_editable[dev] +file:///test/packages/black_editable +./test/packages/black editable +./test/packages/black editable ; python_version >= "3.9" +./test/packages/black editable # comment diff --git a/crates/uv-workspace/src/workspace.rs b/crates/uv-workspace/src/workspace.rs index 6bd329d6e..f40982df9 100644 --- a/crates/uv-workspace/src/workspace.rs +++ b/crates/uv-workspace/src/workspace.rs @@ -1827,7 +1827,7 @@ mod tests { .unwrap() .parent() .unwrap() - .join("scripts") + .join("test") .join("workspaces"); let project = ProjectWorkspace::discover( &root_dir.join(folder), diff --git a/crates/uv/tests/it/build.rs b/crates/uv/tests/it/build.rs index b1828e4e3..73b746cb1 100644 --- a/crates/uv/tests/it/build.rs +++ b/crates/uv/tests/it/build.rs @@ -1533,7 +1533,7 @@ fn build_non_package() -> Result<()> { fn build_fast_path() -> Result<()> { let context = TestContext::new("3.12"); - let built_by_uv = current_dir()?.join("../../scripts/packages/built-by-uv"); + let built_by_uv = current_dir()?.join("../../test/packages/built-by-uv"); uv_snapshot!(context.build() .arg(&built_by_uv) @@ -1633,7 +1633,7 @@ fn build_fast_path() -> Result<()> { fn build_list_files() -> Result<()> { let context = TestContext::new("3.12"); - let built_by_uv = current_dir()?.join("../../scripts/packages/built-by-uv"); + let built_by_uv = current_dir()?.join("../../test/packages/built-by-uv"); // By default, we build the wheel from the source dist, which we need to do even for the list // task. @@ -1755,7 +1755,7 @@ fn build_list_files() -> Result<()> { fn build_list_files_errors() -> Result<()> { let context = TestContext::new("3.12"); - let built_by_uv = current_dir()?.join("../../scripts/packages/built-by-uv"); + let built_by_uv = current_dir()?.join("../../test/packages/built-by-uv"); let mut filters = context.filters(); // In CI, we run with link mode settings. @@ -1779,7 +1779,7 @@ fn build_list_files_errors() -> Result<()> { "###); // Not a uv build backend package, we can't list it. - let anyio_local = current_dir()?.join("../../scripts/packages/anyio_local"); + let anyio_local = current_dir()?.join("../../test/packages/anyio_local"); let mut filters = context.filters(); // Windows normalization filters.push(("/crates/uv/../../", "/")); @@ -1793,7 +1793,7 @@ fn build_list_files_errors() -> Result<()> { ----- stdout ----- ----- stderr ----- - × Failed to build `[WORKSPACE]/scripts/packages/anyio_local` + × Failed to build `[WORKSPACE]/test/packages/anyio_local` ╰─▶ Can only use `--list` with the uv backend "###); Ok(()) @@ -1802,7 +1802,7 @@ fn build_list_files_errors() -> Result<()> { #[test] fn build_version_mismatch() -> Result<()> { let context = TestContext::new("3.12"); - let anyio_local = current_dir()?.join("../../scripts/packages/anyio_local"); + let anyio_local = current_dir()?.join("../../test/packages/anyio_local"); context .build() .arg("--sdist") diff --git a/crates/uv/tests/it/build_backend.rs b/crates/uv/tests/it/build_backend.rs index 232ea572a..0afa76bf6 100644 --- a/crates/uv/tests/it/build_backend.rs +++ b/crates/uv/tests/it/build_backend.rs @@ -27,7 +27,7 @@ const BUILT_BY_UV_TEST_SCRIPT: &str = indoc! {r#" #[cfg(feature = "pypi")] fn built_by_uv_direct_wheel() -> Result<()> { let context = TestContext::new("3.12"); - let built_by_uv = Path::new("../../scripts/packages/built-by-uv"); + let built_by_uv = Path::new("../../test/packages/built-by-uv"); let temp_dir = TempDir::new()?; @@ -83,7 +83,7 @@ fn built_by_uv_direct_wheel() -> Result<()> { #[cfg(feature = "pypi")] fn built_by_uv_direct() -> Result<()> { let context = TestContext::new("3.12"); - let built_by_uv = Path::new("../../scripts/packages/built-by-uv"); + let built_by_uv = Path::new("../../test/packages/built-by-uv"); let sdist_dir = TempDir::new()?; @@ -157,7 +157,7 @@ fn built_by_uv_direct() -> Result<()> { #[cfg(feature = "pypi")] fn built_by_uv_editable() -> Result<()> { let context = TestContext::new("3.12"); - let built_by_uv = Path::new("../../scripts/packages/built-by-uv"); + let built_by_uv = Path::new("../../test/packages/built-by-uv"); // Without the editable, pytest fails. context.pip_install().arg("pytest").assert().success(); diff --git a/crates/uv/tests/it/common/mod.rs b/crates/uv/tests/it/common/mod.rs index 045ea1d32..0b7667fd8 100644 --- a/crates/uv/tests/it/common/mod.rs +++ b/crates/uv/tests/it/common/mod.rs @@ -1630,11 +1630,11 @@ impl TestContext { /// test context. /// /// The given name should correspond to the name of a sub-directory (not a - /// path to it) in the top-level `ecosystem` directory. + /// path to it) in the `test/ecosystem` directory. /// /// This panics (fails the current test) for any failure. pub fn copy_ecosystem_project(&self, name: &str) { - let project_dir = PathBuf::from(format!("../../ecosystem/{name}")); + let project_dir = PathBuf::from(format!("../../test/ecosystem/{name}")); self.temp_dir.copy_from(project_dir, &["*"]).unwrap(); // If there is a (gitignore) lockfile, remove it. if let Err(err) = fs_err::remove_file(self.temp_dir.join("uv.lock")) { diff --git a/crates/uv/tests/it/ecosystem.rs b/crates/uv/tests/it/ecosystem.rs index aae175834..939224df3 100644 --- a/crates/uv/tests/it/ecosystem.rs +++ b/crates/uv/tests/it/ecosystem.rs @@ -80,7 +80,7 @@ fn airflow() -> Result<()> { } /// Does a lock on the given ecosystem package for the given name. That -/// is, there should be a directory at `./ecosystem/{name}` from the +/// is, there should be a directory at `./test/ecosystem/{name}` from the /// root of the `uv` repository. fn lock_ecosystem_package(python_version: &str, name: &str) -> Result<()> { let context = TestContext::new(python_version); diff --git a/crates/uv/tests/it/edit.rs b/crates/uv/tests/it/edit.rs index bc364a787..1cb07b383 100644 --- a/crates/uv/tests/it/edit.rs +++ b/crates/uv/tests/it/edit.rs @@ -7521,7 +7521,7 @@ async fn add_requirements_from_remote_script() -> Result<()> { fn remove_repeated() -> Result<()> { let context = TestContext::new("3.12"); - let anyio_local = context.workspace_root.join("scripts/packages/anyio_local"); + let anyio_local = context.workspace_root.join("test/packages/anyio_local"); let pyproject_toml = context.temp_dir.child("pyproject.toml"); pyproject_toml.write_str(&formatdoc! {r#" @@ -7553,7 +7553,7 @@ fn remove_repeated() -> Result<()> { Resolved 2 packages in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + anyio==4.3.0+foo (from file://[WORKSPACE]/scripts/packages/anyio_local) + + anyio==4.3.0+foo (from file://[WORKSPACE]/test/packages/anyio_local) "); let pyproject_toml = context.read("pyproject.toml"); @@ -7576,7 +7576,7 @@ fn remove_repeated() -> Result<()> { dev-dependencies = ["anyio"] [tool.uv.sources] - anyio = { path = "[WORKSPACE]/scripts/packages/anyio_local" } + anyio = { path = "[WORKSPACE]/test/packages/anyio_local" } "### ); }); @@ -7612,7 +7612,7 @@ fn remove_repeated() -> Result<()> { dev-dependencies = ["anyio"] [tool.uv.sources] - anyio = { path = "[WORKSPACE]/scripts/packages/anyio_local" } + anyio = { path = "[WORKSPACE]/test/packages/anyio_local" } "### ); }); @@ -7626,7 +7626,7 @@ fn remove_repeated() -> Result<()> { warning: The `tool.uv.dev-dependencies` field (used in `pyproject.toml`) is deprecated and will be removed in a future release; use `dependency-groups.dev` instead Resolved 1 package in [TIME] Uninstalled 1 package in [TIME] - - anyio==4.3.0+foo (from file://[WORKSPACE]/scripts/packages/anyio_local) + - anyio==4.3.0+foo (from file://[WORKSPACE]/test/packages/anyio_local) "); let pyproject_toml = context.read("pyproject.toml"); @@ -11003,7 +11003,7 @@ fn add_index_with_existing_relative_path_index() -> Result<()> { let wheel_src = context .workspace_root - .join("scripts/links/ok-1.0.0-py3-none-any.whl"); + .join("test/links/ok-1.0.0-py3-none-any.whl"); let wheel_dst = packages.child("ok-1.0.0-py3-none-any.whl"); fs_err::copy(&wheel_src, &wheel_dst)?; @@ -13021,7 +13021,7 @@ fn add_index_url_in_keyring() -> Result<()> { .arg( keyring_context .workspace_root - .join("scripts") + .join("test") .join("packages") .join("keyring_test_plugin"), ) @@ -13079,7 +13079,7 @@ fn add_full_url_in_keyring() -> Result<()> { .arg( keyring_context .workspace_root - .join("scripts") + .join("test") .join("packages") .join("keyring_test_plugin"), ) @@ -13756,7 +13756,7 @@ async fn add_redirect_with_keyring_cross_origin() -> Result<()> { .arg( keyring_context .workspace_root - .join("scripts") + .join("test") .join("packages") .join("keyring_test_plugin"), ) diff --git a/crates/uv/tests/it/lock.rs b/crates/uv/tests/it/lock.rs index d6cdb3047..6f7256932 100644 --- a/crates/uv/tests/it/lock.rs +++ b/crates/uv/tests/it/lock.rs @@ -11044,7 +11044,7 @@ fn lock_find_links_local_wheel() -> Result<()> { // Populate the `--find-links` entries. fs_err::create_dir_all(context.temp_dir.join("links"))?; - for entry in fs_err::read_dir(context.workspace_root.join("scripts/links"))? { + for entry in fs_err::read_dir(context.workspace_root.join("test/links"))? { let entry = entry?; let path = entry.path(); if path @@ -11158,7 +11158,7 @@ fn lock_find_links_ignore_explicit_index() -> Result<()> { // Populate the `--find-links` entries. fs_err::create_dir_all(context.temp_dir.join("links"))?; - for entry in fs_err::read_dir(context.workspace_root.join("scripts/links"))? { + for entry in fs_err::read_dir(context.workspace_root.join("test/links"))? { let entry = entry?; let path = entry.path(); if path @@ -11279,7 +11279,7 @@ fn lock_find_links_relative_url() -> Result<()> { // Populate the `--find-links` entries. fs_err::create_dir_all(context.temp_dir.join("links"))?; - for entry in fs_err::read_dir(context.workspace_root.join("scripts/links"))? { + for entry in fs_err::read_dir(context.workspace_root.join("test/links"))? { let entry = entry?; let path = entry.path(); if path @@ -11395,7 +11395,7 @@ fn lock_find_links_local_sdist() -> Result<()> { // Populate the `--find-links` entries. fs_err::create_dir_all(context.temp_dir.join("links"))?; - for entry in fs_err::read_dir(context.workspace_root.join("scripts/links"))? { + for entry in fs_err::read_dir(context.workspace_root.join("test/links"))? { let entry = entry?; let path = entry.path(); if path @@ -11689,7 +11689,7 @@ fn lock_find_links_explicit_index() -> Result<()> { // Populate the `--find-links` entries. fs_err::create_dir_all(context.temp_dir.join("links"))?; - for entry in fs_err::read_dir(context.workspace_root.join("scripts/links"))? { + for entry in fs_err::read_dir(context.workspace_root.join("test/links"))? { let entry = entry?; let path = entry.path(); if path @@ -11795,7 +11795,7 @@ fn lock_find_links_higher_priority_index() -> Result<()> { // Populate the `--find-links` entries. fs_err::create_dir_all(context.temp_dir.join("links"))?; - for entry in fs_err::read_dir(context.workspace_root.join("scripts/links"))? { + for entry in fs_err::read_dir(context.workspace_root.join("test/links"))? { let entry = entry?; let path = entry.path(); if path @@ -11886,7 +11886,7 @@ fn lock_find_links_lower_priority_index() -> Result<()> { // Populate the `--find-links` entries. fs_err::create_dir_all(context.temp_dir.join("links"))?; - for entry in fs_err::read_dir(context.workspace_root.join("scripts/links"))? { + for entry in fs_err::read_dir(context.workspace_root.join("test/links"))? { let entry = entry?; let path = entry.path(); if path @@ -12001,7 +12001,7 @@ fn lock_local_index() -> Result<()> { fs_err::copy( context .workspace_root - .join("scripts/links/basic_package-0.1.0.tar.gz"), + .join("test/links/basic_package-0.1.0.tar.gz"), &sdist, )?; @@ -12009,7 +12009,7 @@ fn lock_local_index() -> Result<()> { fs_err::copy( context .workspace_root - .join("scripts/links/basic_package-0.1.0-py3-none-any.whl"), + .join("test/links/basic_package-0.1.0-py3-none-any.whl"), &wheel, )?; @@ -21051,7 +21051,7 @@ fn lock_keyring_credentials() -> Result<()> { .arg( keyring_context .workspace_root - .join("scripts") + .join("test") .join("packages") .join("keyring_test_plugin"), ) @@ -21146,7 +21146,7 @@ fn lock_keyring_explicit_always() -> Result<()> { .arg( keyring_context .workspace_root - .join("scripts") + .join("test") .join("packages") .join("keyring_test_plugin"), ) @@ -21231,7 +21231,7 @@ fn lock_keyring_credentials_always_authenticate_fetches_username() -> Result<()> .arg( keyring_context .workspace_root - .join("scripts") + .join("test") .join("packages") .join("keyring_test_plugin"), ) @@ -21335,7 +21335,7 @@ fn lock_keyring_credentials_always_authenticate_unsupported_mode() -> Result<()> .arg( keyring_context .workspace_root - .join("scripts") + .join("test") .join("packages") .join("keyring_test_plugin"), ) diff --git a/crates/uv/tests/it/pip_compile.rs b/crates/uv/tests/it/pip_compile.rs index 4f912558e..8a199ceb0 100644 --- a/crates/uv/tests/it/pip_compile.rs +++ b/crates/uv/tests/it/pip_compile.rs @@ -3038,7 +3038,7 @@ fn allowed_transitive_url_path_dependency() -> Result<()> { let requirements_in = context.temp_dir.child("requirements.in"); requirements_in.write_str("hatchling_editable @ ${HATCH_PATH}")?; - let hatchling_path = current_dir()?.join("../../scripts/packages/hatchling_editable"); + let hatchling_path = current_dir()?.join("../../test/packages/hatchling_editable"); uv_snapshot!(context.filters(), context.pip_compile() .arg("requirements.in") .env(EnvVars::HATCH_PATH, hatchling_path.as_os_str()), @r###" @@ -4725,8 +4725,8 @@ fn compile_editable() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); requirements_in.write_str(indoc! {r" - -e ../../scripts/packages/poetry_editable - -e file://../../scripts/packages/black_editable[dev] + -e ../../test/packages/poetry_editable + -e file://../../test/packages/black_editable[dev] boltons # normal dependency for comparison " })?; @@ -4739,9 +4739,9 @@ fn compile_editable() -> Result<()> { ----- stdout ----- # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/requirements.in - -e ../../scripts/packages/poetry_editable + -e ../../test/packages/poetry_editable # via -r [TEMP_DIR]/requirements.in - -e file://../../scripts/packages/black_editable + -e file://../../test/packages/black_editable # via -r [TEMP_DIR]/requirements.in aiohttp==3.9.3 # via black @@ -4785,9 +4785,9 @@ fn deduplicate_editable() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); requirements_in.write_str(indoc! {r" - -e file://../../scripts/packages/black_editable - -e ${PROJECT_ROOT}/../../scripts/packages/black_editable - -e file://../../scripts/packages/black_editable[dev] + -e file://../../test/packages/black_editable + -e ${PROJECT_ROOT}/../../test/packages/black_editable + -e file://../../test/packages/black_editable[dev] " })?; @@ -4799,7 +4799,7 @@ fn deduplicate_editable() -> Result<()> { ----- stdout ----- # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/requirements.in - -e file://../../scripts/packages/black_editable + -e file://../../test/packages/black_editable # via -r [TEMP_DIR]/requirements.in aiohttp==3.9.3 # via black @@ -4834,7 +4834,7 @@ fn strip_fragment_unnamed() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); requirements_in.write_str(indoc! {r" - ../../scripts/packages/black_editable#egg=black + ../../test/packages/black_editable#egg=black " })?; @@ -4846,7 +4846,7 @@ fn strip_fragment_unnamed() -> Result<()> { ----- stdout ----- # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/requirements.in - ../../scripts/packages/black_editable#egg=black + ../../test/packages/black_editable#egg=black # via -r [TEMP_DIR]/requirements.in ----- stderr ----- @@ -4861,7 +4861,7 @@ fn strip_fragment_named() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); requirements_in.write_str(indoc! {r" - black @ ../../scripts/packages/black_editable#egg=black + black @ ../../test/packages/black_editable#egg=black " })?; @@ -4873,7 +4873,7 @@ fn strip_fragment_named() -> Result<()> { ----- stdout ----- # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/requirements.in - ../../scripts/packages/black_editable#egg=black + ../../test/packages/black_editable#egg=black # via -r [TEMP_DIR]/requirements.in ----- stderr ----- @@ -4887,7 +4887,7 @@ fn strip_fragment_named() -> Result<()> { fn recursive_extras_direct_url() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); - requirements_in.write_str("black[dev] @ ../../scripts/packages/black_editable")?; + requirements_in.write_str("black[dev] @ ../../test/packages/black_editable")?; uv_snapshot!(context.filters(), context .pip_compile() @@ -4904,7 +4904,7 @@ fn recursive_extras_direct_url() -> Result<()> { # via aiohttp attrs==23.2.0 # via aiohttp - ../../scripts/packages/black_editable + ../../test/packages/black_editable # via -r [TEMP_DIR]/requirements.in frozenlist==1.4.1 # via @@ -4934,7 +4934,7 @@ fn recursive_extras_direct_url() -> Result<()> { fn compile_editable_url_requirement() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); - requirements_in.write_str("-e ../../scripts/packages/hatchling_editable")?; + requirements_in.write_str("-e ../../test/packages/hatchling_editable")?; uv_snapshot!(context.filters(), context.pip_compile() .arg(requirements_in.path()) @@ -4944,7 +4944,7 @@ fn compile_editable_url_requirement() -> Result<()> { ----- stdout ----- # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/requirements.in - -e ../../scripts/packages/hatchling_editable + -e ../../test/packages/hatchling_editable # via -r [TEMP_DIR]/requirements.in iniconfig @ git+https://github.com/pytest-dev/iniconfig@9cae43103df70bac6fde7b9f35ad11a9f1be0cb4 # via hatchling-editable @@ -5249,7 +5249,7 @@ fn generate_hashes_local_directory() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); requirements_in.write_str(indoc! {r" - ../../scripts/packages/poetry_editable + ../../test/packages/poetry_editable " })?; @@ -5270,7 +5270,7 @@ fn generate_hashes_local_directory() -> Result<()> { --hash=sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca \ --hash=sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f # via anyio - ../../scripts/packages/poetry_editable + ../../test/packages/poetry_editable # via -r [TEMP_DIR]/requirements.in sniffio==1.3.1 \ --hash=sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2 \ @@ -5292,7 +5292,7 @@ fn generate_hashes_editable() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); requirements_in.write_str(indoc! {r" - -e ../../scripts/packages/poetry_editable + -e ../../test/packages/poetry_editable " })?; @@ -5305,7 +5305,7 @@ fn generate_hashes_editable() -> Result<()> { ----- stdout ----- # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/requirements.in --generate-hashes - -e ../../scripts/packages/poetry_editable + -e ../../test/packages/poetry_editable # via -r [TEMP_DIR]/requirements.in anyio==4.3.0 \ --hash=sha256:048e05d0f6caeed70d731f3db756d35dcc1f35747c8c403364a8332c630441b8 \ @@ -5338,7 +5338,7 @@ fn generate_hashes_find_links_directory() -> Result<()> { .arg("requirements.in") .arg("--generate-hashes") .arg("--find-links") - .arg(context.workspace_root.join("scripts").join("links")), @r###" + .arg(context.workspace_root.join("test").join("links")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -5400,7 +5400,7 @@ fn find_links_directory() -> Result<()> { uv_snapshot!(context.filters(), context.pip_compile() .arg("requirements.in") .arg("--find-links") - .arg(context.workspace_root.join("scripts").join("links")), @r###" + .arg(context.workspace_root.join("test").join("links")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -5550,7 +5550,7 @@ fn avoid_irrelevant_extras() -> Result<()> { uv_snapshot!(context.filters(), context.pip_compile() .arg("requirements.in") .arg("--find-links") - .arg(context.workspace_root.join("scripts").join("links")), @r###" + .arg(context.workspace_root.join("test").join("links")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -5603,7 +5603,7 @@ coverage = ["example[test]", "extras>=0.0.1,<=0.0.2"] uv_snapshot!(context.filters(), context.pip_compile() .arg("requirements.in") .arg("--find-links") - .arg(context.workspace_root.join("scripts").join("links")), @r###" + .arg(context.workspace_root.join("test").join("links")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -7013,7 +7013,7 @@ fn invalid_metadata_requires_python() -> Result<()> { .arg("requirements.in") .arg("--no-index") .arg("--find-links") - .arg(context.workspace_root.join("scripts").join("links")), @r###" + .arg(context.workspace_root.join("test").join("links")), @r###" success: false exit_code: 1 ----- stdout ----- @@ -7044,7 +7044,7 @@ fn invalid_metadata_multiple_dist_info() -> Result<()> { .arg("requirements.in") .arg("--no-index") .arg("--find-links") - .arg(context.workspace_root.join("scripts").join("links")), @r###" + .arg(context.workspace_root.join("test").join("links")), @r###" success: false exit_code: 1 ----- stdout ----- @@ -7074,7 +7074,7 @@ fn invalid_metadata_backtrack() -> Result<()> { .arg("requirements.in") .arg("--no-index") .arg("--find-links") - .arg(context.workspace_root.join("scripts").join("links")), @r###" + .arg(context.workspace_root.join("test").join("links")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -7193,7 +7193,7 @@ fn compile_unnamed_preference() -> Result<()> { requirements_in.write_str("black")?; let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.write_str("./scripts/packages/black_editable")?; + requirements_txt.write_str("./test/packages/black_editable")?; uv_snapshot!(context .pip_compile() @@ -7536,7 +7536,7 @@ dependencies = [ fn editable_invalid_extra() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); - requirements_in.write_str("-e ../../scripts/packages/black_editable[empty]")?; + requirements_in.write_str("-e ../../test/packages/black_editable[empty]")?; uv_snapshot!(context.filters(), context.pip_compile() .arg(requirements_in.path()) @@ -7546,12 +7546,12 @@ fn editable_invalid_extra() -> Result<()> { ----- stdout ----- # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/requirements.in - -e ../../scripts/packages/black_editable + -e ../../test/packages/black_editable # via -r [TEMP_DIR]/requirements.in ----- stderr ----- Resolved 1 package in [TIME] - warning: The package `black @ file://[WORKSPACE]/scripts/packages/black_editable` does not have an extra named `empty` + warning: The package `black @ file://[WORKSPACE]/test/packages/black_editable` does not have an extra named `empty` "###); Ok(()) @@ -10140,7 +10140,7 @@ fn editable_override() -> Result<()> { // Add an editable override. let overrides_txt = context.temp_dir.child("overrides.txt"); - overrides_txt.write_str("-e ../../scripts/packages/black_editable")?; + overrides_txt.write_str("-e ../../test/packages/black_editable")?; uv_snapshot!(context.filters(), context.pip_compile() .arg(requirements_in.path()) @@ -10152,7 +10152,7 @@ fn editable_override() -> Result<()> { ----- stdout ----- # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/requirements.in --override [TEMP_DIR]/overrides.txt - -e ../../scripts/packages/black_editable + -e ../../test/packages/black_editable # via # --override [TEMP_DIR]/overrides.txt # -r [TEMP_DIR]/requirements.in @@ -10170,7 +10170,7 @@ fn editable_override() -> Result<()> { fn override_editable() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); - requirements_in.write_str("-e ../../scripts/packages/black_editable")?; + requirements_in.write_str("-e ../../test/packages/black_editable")?; let overrides_txt = context.temp_dir.child("overrides.txt"); overrides_txt.write_str("black==23.10.1")?; @@ -10719,7 +10719,7 @@ qux = ["project[bop] ; python_version == '3.12'"] fn editable_direct_dependency() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); - requirements_in.write_str("-e ../../scripts/packages/setuptools_editable")?; + requirements_in.write_str("-e ../../test/packages/setuptools_editable")?; uv_snapshot!(context.filters(), context.pip_compile() .arg(requirements_in.path()) @@ -10731,7 +10731,7 @@ fn editable_direct_dependency() -> Result<()> { ----- stdout ----- # This file was autogenerated by uv via the following command: # uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/requirements.in --resolution lowest-direct - -e ../../scripts/packages/setuptools_editable + -e ../../test/packages/setuptools_editable # via -r [TEMP_DIR]/requirements.in iniconfig==0.1 # via setuptools-editable @@ -11189,7 +11189,7 @@ fn compile_root_uri_editable() -> Result<()> { let requirements_in = context.temp_dir.child("requirements.in"); requirements_in.write_str("-e ${ROOT_PATH}")?; - let root_path = current_dir()?.join("../../scripts/packages/root_editable"); + let root_path = current_dir()?.join("../../test/packages/root_editable"); uv_snapshot!(context.filters(), context.pip_compile() .arg("requirements.in") .env(EnvVars::ROOT_PATH, root_path.as_os_str()), @r###" @@ -11200,7 +11200,7 @@ fn compile_root_uri_editable() -> Result<()> { # uv pip compile --cache-dir [CACHE_DIR] requirements.in -e ${ROOT_PATH} # via -r requirements.in - black @ file://[WORKSPACE]/scripts/packages/root_editable/../black_editable + black @ file://[WORKSPACE]/test/packages/root_editable/../black_editable # via root-editable ----- stderr ----- @@ -11219,8 +11219,8 @@ fn compile_root_uri_non_editable() -> Result<()> { let requirements_in = context.temp_dir.child("requirements.in"); requirements_in.write_str("${ROOT_PATH}\n${BLACK_PATH}")?; - let root_path = current_dir()?.join("../../scripts/packages/root_editable"); - let black_path = current_dir()?.join("../../scripts/packages/black_editable"); + let root_path = current_dir()?.join("../../test/packages/root_editable"); + let black_path = current_dir()?.join("../../test/packages/black_editable"); uv_snapshot!(context.filters(), context.pip_compile() .arg("requirements.in") .env(EnvVars::ROOT_PATH, root_path.as_os_str()) @@ -11598,10 +11598,10 @@ fn unnamed_path_requirement() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); requirements_in.write_str(indoc! {r" - ../../scripts/packages/poetry_editable - ../../scripts/packages/black_editable - ../../scripts/packages/setup_py_editable - ../../scripts/packages/setup_cfg_editable + ../../test/packages/poetry_editable + ../../test/packages/black_editable + ../../test/packages/setup_py_editable + ../../test/packages/setup_cfg_editable " })?; @@ -11617,7 +11617,7 @@ fn unnamed_path_requirement() -> Result<()> { # via # httpx # poetry-editable - ../../scripts/packages/black_editable + ../../test/packages/black_editable # via -r [TEMP_DIR]/requirements.in certifi==2024.2.2 # via @@ -11637,13 +11637,13 @@ fn unnamed_path_requirement() -> Result<()> { # anyio # httpx # requests - ../../scripts/packages/poetry_editable + ../../test/packages/poetry_editable # via -r [TEMP_DIR]/requirements.in requests==2.31.0 # via setup-cfg-editable - ../../scripts/packages/setup_cfg_editable + ../../test/packages/setup_cfg_editable # via -r [TEMP_DIR]/requirements.in - ../../scripts/packages/setup_py_editable + ../../test/packages/setup_py_editable # via -r [TEMP_DIR]/requirements.in sniffio==1.3.1 # via @@ -11742,7 +11742,7 @@ fn unnamed_https_requirement() -> Result<()> { fn dynamic_dependencies() -> Result<()> { let context = TestContext::new("3.12"); let requirements_in = context.temp_dir.child("requirements.in"); - requirements_in.write_str("hatchling-dynamic @ ../../scripts/packages/hatchling_dynamic")?; + requirements_in.write_str("hatchling-dynamic @ ../../test/packages/hatchling_dynamic")?; uv_snapshot!(context.filters(), context.pip_compile() .arg(requirements_in.path()) @@ -11754,7 +11754,7 @@ fn dynamic_dependencies() -> Result<()> { # uv pip compile --cache-dir [CACHE_DIR] [TEMP_DIR]/requirements.in anyio==4.3.0 # via hatchling-dynamic - ../../scripts/packages/hatchling_dynamic + ../../test/packages/hatchling_dynamic # via -r [TEMP_DIR]/requirements.in idna==3.6 # via anyio @@ -11920,7 +11920,7 @@ fn emit_marker_expression_pypy() -> Result<()> { #[test] fn local_version_of_remote_package() -> Result<()> { let context = TestContext::new("3.12"); - let root_path = context.workspace_root.join("scripts/packages"); + let root_path = context.workspace_root.join("test/packages"); let requirements_in = context.temp_dir.child("requirements.in"); requirements_in.write_str("anyio")?; @@ -11957,7 +11957,7 @@ fn local_version_of_remote_package() -> Result<()> { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + anyio==4.3.0+foo (from file://[WORKSPACE]/scripts/packages/anyio_local) + + anyio==4.3.0+foo (from file://[WORKSPACE]/test/packages/anyio_local) "### ); @@ -11983,7 +11983,7 @@ fn local_version_of_remote_package() -> Result<()> { // Write a lockfile with the local version let requirements_txt = context.temp_dir.child("requirements.txt"); requirements_txt.write_str(&indoc::formatdoc! {r" - anyio @ {workspace_root}/scripts/packages/anyio_local + anyio @ {workspace_root}/test/packages/anyio_local ", workspace_root = context.workspace_root.simplified_display(), })?; @@ -13376,11 +13376,11 @@ fn tool_uv_sources() -> Result<()> { let project_root = fs_err::canonicalize(current_dir()?.join("../.."))?; fs_err::create_dir_all(context.temp_dir.join("poetry_editable/poetry_editable"))?; fs_err::copy( - project_root.join("scripts/packages/poetry_editable/pyproject.toml"), + project_root.join("test/packages/poetry_editable/pyproject.toml"), context.temp_dir.join("poetry_editable/pyproject.toml"), )?; fs_err::copy( - project_root.join("scripts/packages/poetry_editable/poetry_editable/__init__.py"), + project_root.join("test/packages/poetry_editable/poetry_editable/__init__.py"), context .temp_dir .join("poetry_editable/poetry_editable/__init__.py"), diff --git a/crates/uv/tests/it/pip_freeze.rs b/crates/uv/tests/it/pip_freeze.rs index eb7f90e97..416e9f2d1 100644 --- a/crates/uv/tests/it/pip_freeze.rs +++ b/crates/uv/tests/it/pip_freeze.rs @@ -131,7 +131,7 @@ fn freeze_with_editable() -> Result<()> { "anyio\n-e {}", context .workspace_root - .join("scripts/packages/poetry_editable") + .join("test/packages/poetry_editable") .display() ))?; @@ -149,7 +149,7 @@ fn freeze_with_editable() -> Result<()> { exit_code: 0 ----- stdout ----- anyio==4.3.0 - -e file://[WORKSPACE]/scripts/packages/poetry_editable + -e file://[WORKSPACE]/test/packages/poetry_editable ----- stderr ----- warning: The package `anyio` requires `idna>=2.8`, but it's not installed diff --git a/crates/uv/tests/it/pip_install.rs b/crates/uv/tests/it/pip_install.rs index b442fd111..e7129c40b 100644 --- a/crates/uv/tests/it/pip_install.rs +++ b/crates/uv/tests/it/pip_install.rs @@ -1377,7 +1377,7 @@ fn install_extras() -> Result<()> { uv_snapshot!(context.filters(), context.pip_install() .arg("--all-extras") .arg("-e") - .arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r" + .arg(context.workspace_root.join("test/packages/poetry_editable")), @r" success: false exit_code: 2 ----- stdout ----- @@ -1390,7 +1390,7 @@ fn install_extras() -> Result<()> { // Request extras for a source tree uv_snapshot!(context.filters(), context.pip_install() .arg("--all-extras") - .arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r" + .arg(context.workspace_root.join("test/packages/poetry_editable")), @r" success: false exit_code: 2 ----- stdout ----- @@ -1453,7 +1453,7 @@ fn install_editable() { // Install the editable package. uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###" + .arg(context.workspace_root.join("test/packages/poetry_editable")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -1464,7 +1464,7 @@ fn install_editable() { Installed 4 packages in [TIME] + anyio==4.3.0 + idna==3.6 - + poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable) + + poetry-editable==0.1.0 (from file://[WORKSPACE]/test/packages/poetry_editable) + sniffio==1.3.1 "### ); @@ -1472,7 +1472,7 @@ fn install_editable() { // Install it again. uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###" + .arg(context.workspace_root.join("test/packages/poetry_editable")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -1482,14 +1482,14 @@ fn install_editable() { Prepared 1 package in [TIME] Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - ~ poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable) + ~ poetry-editable==0.1.0 (from file://[WORKSPACE]/test/packages/poetry_editable) "### ); // Add another, non-editable dependency. uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/poetry_editable")) + .arg(context.workspace_root.join("test/packages/poetry_editable")) .arg("black"), @r###" success: true exit_code: 0 @@ -1506,7 +1506,7 @@ fn install_editable() { + packaging==24.0 + pathspec==0.12.1 + platformdirs==4.2.0 - ~ poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable) + ~ poetry-editable==0.1.0 (from file://[WORKSPACE]/test/packages/poetry_editable) "### ); } @@ -1538,7 +1538,7 @@ fn install_editable_and_registry() { // Install the editable version of Black. This should remove the registry-based version. uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/black_editable")), @r###" + .arg(context.workspace_root.join("test/packages/black_editable")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -1549,7 +1549,7 @@ fn install_editable_and_registry() { Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - black==24.3.0 - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) "### ); @@ -1580,7 +1580,7 @@ fn install_editable_and_registry() { Prepared [N] packages in [TIME] Uninstalled [N] packages in [TIME] Installed [N] packages in [TIME] - - black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + - black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) + black==23.10.0 "### ); @@ -1593,7 +1593,7 @@ fn install_editable_no_binary() { // Install the editable package with no-binary enabled uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/black_editable")) + .arg(context.workspace_root.join("test/packages/black_editable")) .arg("--no-binary") .arg(":all:"), @r###" success: true @@ -1604,7 +1604,7 @@ fn install_editable_no_binary() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) "### ); } @@ -1619,7 +1619,7 @@ fn install_editable_compatible_constraint() -> Result<()> { // Install the editable package with a compatible constraint. uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/black_editable")) + .arg(context.workspace_root.join("test/packages/black_editable")) .arg("--constraint") .arg("constraints.txt"), @r###" success: true @@ -1630,7 +1630,7 @@ fn install_editable_compatible_constraint() -> Result<()> { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) "### ); @@ -1647,7 +1647,7 @@ fn install_editable_incompatible_constraint_version() -> Result<()> { // Install the editable package with an incompatible constraint. uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/black_editable")) + .arg(context.workspace_root.join("test/packages/black_editable")) .arg("--constraint") .arg("constraints.txt"), @r###" success: false @@ -1673,7 +1673,7 @@ fn install_editable_incompatible_constraint_url() -> Result<()> { // Install the editable package with an incompatible constraint. uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/black_editable")) + .arg(context.workspace_root.join("test/packages/black_editable")) .arg("--constraint") .arg("constraints.txt"), @r" success: false @@ -1682,7 +1682,7 @@ fn install_editable_incompatible_constraint_url() -> Result<()> { ----- stderr ----- error: Requirements contain conflicting URLs for package `black`: - - file://[WORKSPACE]/scripts/packages/black_editable (editable) + - file://[WORKSPACE]/test/packages/black_editable (editable) - https://files.pythonhosted.org/packages/0f/89/294c9a6b6c75a08da55e9d05321d0707e9418735e3062b12ef0f54c33474/black-24.4.2-py3-none-any.whl " ); @@ -1696,7 +1696,7 @@ fn install_editable_pep_508_requirements_txt() -> Result<()> { let requirements_txt = context.temp_dir.child("requirements.txt"); requirements_txt.write_str(&indoc::formatdoc! {r" - -e black[d] @ file://{workspace_root}/scripts/packages/black_editable + -e black[d] @ file://{workspace_root}/test/packages/black_editable ", workspace_root = context.workspace_root.simplified_display(), })?; @@ -1715,7 +1715,7 @@ fn install_editable_pep_508_requirements_txt() -> Result<()> { + aiohttp==3.9.3 + aiosignal==1.3.1 + attrs==23.2.0 - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) + frozenlist==1.4.1 + idna==3.6 + multidict==6.0.5 @@ -1724,7 +1724,7 @@ fn install_editable_pep_508_requirements_txt() -> Result<()> { ); requirements_txt.write_str(&indoc::formatdoc! {r" - --editable black[d] @ file://{workspace_root}/scripts/packages/black_editable + --editable black[d] @ file://{workspace_root}/test/packages/black_editable ", workspace_root = context.workspace_root.simplified_display(), })?; @@ -1742,7 +1742,7 @@ fn install_editable_pep_508_requirements_txt() -> Result<()> { ); requirements_txt.write_str(&indoc::formatdoc! {r" - --editable=black[d] @ file://{workspace_root}/scripts/packages/black_editable + --editable=black[d] @ file://{workspace_root}/test/packages/black_editable ", workspace_root = context.workspace_root.simplified_display(), })?; @@ -1760,7 +1760,7 @@ fn install_editable_pep_508_requirements_txt() -> Result<()> { ); requirements_txt.write_str(&indoc::formatdoc! {r" - --editable= black[d] @ file://{workspace_root}/scripts/packages/black_editable + --editable= black[d] @ file://{workspace_root}/test/packages/black_editable ", workspace_root = context.workspace_root.simplified_display(), })?; @@ -1786,7 +1786,7 @@ fn install_editable_pep_508_cli() { uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(format!("black[d] @ file://{workspace_root}/scripts/packages/black_editable", workspace_root = context.workspace_root.simplified_display())), @r###" + .arg(format!("black[d] @ file://{workspace_root}/test/packages/black_editable", workspace_root = context.workspace_root.simplified_display())), @r###" success: true exit_code: 0 ----- stdout ----- @@ -1798,7 +1798,7 @@ fn install_editable_pep_508_cli() { + aiohttp==3.9.3 + aiosignal==1.3.1 + attrs==23.2.0 - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) + frozenlist==1.4.1 + idna==3.6 + multidict==6.0.5 @@ -1811,7 +1811,7 @@ fn install_editable_pep_508_cli() { fn install_editable_bare_cli() { let context = TestContext::new("3.12"); - let packages_dir = context.workspace_root.join("scripts/packages"); + let packages_dir = context.workspace_root.join("test/packages"); uv_snapshot!(context.filters(), context.pip_install() .arg("-e") @@ -1826,7 +1826,7 @@ fn install_editable_bare_cli() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) "### ); } @@ -1838,7 +1838,7 @@ fn install_editable_bare_requirements_txt() -> Result<()> { let requirements_txt = context.temp_dir.child("requirements.txt"); requirements_txt.write_str("-e black_editable")?; - let packages_dir = context.workspace_root.join("scripts/packages"); + let packages_dir = context.workspace_root.join("test/packages"); uv_snapshot!(context.filters(), context.pip_install() .arg("-r") @@ -1853,7 +1853,7 @@ fn install_editable_bare_requirements_txt() -> Result<()> { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) "### ); @@ -3012,7 +3012,7 @@ fn only_binary_editable() { .arg("--only-binary") .arg(":all:") .arg("-e") - .arg(context.workspace_root.join("scripts/packages/anyio_local")), @r###" + .arg(context.workspace_root.join("test/packages/anyio_local")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -3021,7 +3021,7 @@ fn only_binary_editable() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + anyio==4.3.0+foo (from file://[WORKSPACE]/scripts/packages/anyio_local) + + anyio==4.3.0+foo (from file://[WORKSPACE]/test/packages/anyio_local) "### ); } @@ -3032,7 +3032,7 @@ fn only_binary_dependent_editables() { let context = TestContext::new("3.12"); let root_path = context .workspace_root - .join("scripts/packages/dependent_locals"); + .join("test/packages/dependent_locals"); // Install the editable package. uv_snapshot!(context.filters(), context.pip_install() @@ -3050,8 +3050,8 @@ fn only_binary_dependent_editables() { Resolved 2 packages in [TIME] Prepared 2 packages in [TIME] Installed 2 packages in [TIME] - + first-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/first_local) - + second-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/second_local) + + first-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/first_local) + + second-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/second_local) "### ); } @@ -3066,7 +3066,7 @@ fn only_binary_editable_setup_py() { .arg("--only-binary") .arg(":all:") .arg("-e") - .arg(context.workspace_root.join("scripts/packages/setup_py_editable")), @r###" + .arg(context.workspace_root.join("test/packages/setup_py_editable")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -3081,7 +3081,7 @@ fn only_binary_editable_setup_py() { + httpcore==1.0.4 + httpx==0.27.0 + idna==3.6 - + setup-py-editable==0.0.1 (from file://[WORKSPACE]/scripts/packages/setup_py_editable) + + setup-py-editable==0.0.1 (from file://[WORKSPACE]/test/packages/setup_py_editable) + sniffio==1.3.1 "### ); @@ -3328,7 +3328,7 @@ fn no_deps_editable() { uv_snapshot!(context.filters(), context.pip_install() .arg("--no-deps") .arg("-e") - .arg(context.workspace_root.join("scripts/packages/black_editable[dev]")), @r###" + .arg(context.workspace_root.join("test/packages/black_editable[dev]")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -3337,7 +3337,7 @@ fn no_deps_editable() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) "### ); @@ -3963,7 +3963,7 @@ fn launcher() -> Result<()> { uv_snapshot!( filters, context.pip_install() - .arg(format!("simple_launcher@{}", project_root.join("scripts/links/simple_launcher-0.1.0-py3-none-any.whl").display())) + .arg(format!("simple_launcher@{}", project_root.join("test/links/simple_launcher-0.1.0-py3-none-any.whl").display())) .arg("--strict"), @r###" success: true exit_code: 0 @@ -4008,7 +4008,7 @@ fn launcher_with_symlink() -> Result<()> { uv_snapshot!(filters, context.pip_install() - .arg(format!("simple_launcher@{}", project_root.join("scripts/links/simple_launcher-0.1.0-py3-none-any.whl").display())) + .arg(format!("simple_launcher@{}", project_root.join("test/links/simple_launcher-0.1.0-py3-none-any.whl").display())) .arg("--strict"), @r###" success: true @@ -4151,7 +4151,7 @@ fn config_settings_path() -> Result<()> { "-e {}", context .workspace_root - .join("scripts/packages/setuptools_editable") + .join("test/packages/setuptools_editable") .display() ))?; @@ -4168,7 +4168,7 @@ fn config_settings_path() -> Result<()> { Prepared 2 packages in [TIME] Installed 2 packages in [TIME] + iniconfig==2.0.0 - + setuptools-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/setuptools_editable) + + setuptools-editable==0.1.0 (from file://[WORKSPACE]/test/packages/setuptools_editable) "### ); @@ -4194,7 +4194,7 @@ fn config_settings_path() -> Result<()> { Prepared 1 package in [TIME] Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - ~ setuptools-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/setuptools_editable) + ~ setuptools-editable==0.1.0 (from file://[WORKSPACE]/test/packages/setuptools_editable) " ); @@ -4903,7 +4903,7 @@ fn path_name_version_change() { let context = TestContext::new("3.12"); uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/links/ok-1.0.0-py3-none-any.whl")), @r###" + .arg(context.workspace_root.join("test/links/ok-1.0.0-py3-none-any.whl")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -4912,13 +4912,13 @@ fn path_name_version_change() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + ok==1.0.0 (from file://[WORKSPACE]/scripts/links/ok-1.0.0-py3-none-any.whl) + + ok==1.0.0 (from file://[WORKSPACE]/test/links/ok-1.0.0-py3-none-any.whl) "### ); // Installing the same path again should be a no-op uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/links/ok-1.0.0-py3-none-any.whl")), @r###" + .arg(context.workspace_root.join("test/links/ok-1.0.0-py3-none-any.whl")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -4930,7 +4930,7 @@ fn path_name_version_change() { // Installing a new path should succeed uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/links/ok-2.0.0-py3-none-any.whl")), @r###" + .arg(context.workspace_root.join("test/links/ok-2.0.0-py3-none-any.whl")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -4940,14 +4940,14 @@ fn path_name_version_change() { Prepared 1 package in [TIME] Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - - ok==1.0.0 (from file://[WORKSPACE]/scripts/links/ok-1.0.0-py3-none-any.whl) - + ok==2.0.0 (from file://[WORKSPACE]/scripts/links/ok-2.0.0-py3-none-any.whl) + - ok==1.0.0 (from file://[WORKSPACE]/test/links/ok-1.0.0-py3-none-any.whl) + + ok==2.0.0 (from file://[WORKSPACE]/test/links/ok-2.0.0-py3-none-any.whl) "### ); // Installing a new path should succeed regardless of which version is "newer" uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/links/ok-1.0.0-py3-none-any.whl")), @r###" + .arg(context.workspace_root.join("test/links/ok-1.0.0-py3-none-any.whl")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -4956,8 +4956,8 @@ fn path_name_version_change() { Resolved 1 package in [TIME] Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - - ok==2.0.0 (from file://[WORKSPACE]/scripts/links/ok-2.0.0-py3-none-any.whl) - + ok==1.0.0 (from file://[WORKSPACE]/scripts/links/ok-1.0.0-py3-none-any.whl) + - ok==2.0.0 (from file://[WORKSPACE]/test/links/ok-2.0.0-py3-none-any.whl) + + ok==1.0.0 (from file://[WORKSPACE]/test/links/ok-1.0.0-py3-none-any.whl) "### ); } @@ -4969,7 +4969,7 @@ fn path_changes_with_same_name() -> Result<()> { let wheel = context .workspace_root - .join("scripts/links/ok-1.0.0-py3-none-any.whl"); + .join("test/links/ok-1.0.0-py3-none-any.whl"); let one = context.temp_dir.child("one"); one.create_dir_all()?; @@ -5780,7 +5780,7 @@ fn install_package_basic_auth_from_keyring() { .arg( context .workspace_root - .join("scripts") + .join("test") .join("packages") .join("keyring_test_plugin"), ) @@ -5827,7 +5827,7 @@ fn install_package_basic_auth_from_keyring_wrong_password() { .arg( context .workspace_root - .join("scripts") + .join("test") .join("packages") .join("keyring_test_plugin"), ) @@ -5870,7 +5870,7 @@ fn install_package_basic_auth_from_keyring_wrong_username() { .arg( context .workspace_root - .join("scripts") + .join("test") .join("packages") .join("keyring_test_plugin"), ) @@ -5982,7 +5982,7 @@ fn deptry_gitignore() { let source_dist_dir = context .workspace_root - .join("scripts/packages/deptry_reproducer"); + .join("test/packages/deptry_reproducer"); uv_snapshot!(context.filters(), context.pip_install() .arg(format!("deptry_reproducer @ {}", source_dist_dir.join("deptry_reproducer-0.1.0.tar.gz").simplified_display())) @@ -5998,7 +5998,7 @@ fn deptry_gitignore() { Prepared 3 packages in [TIME] Installed 3 packages in [TIME] + cffi==1.16.0 - + deptry-reproducer==0.1.0 (from file://[WORKSPACE]/scripts/packages/deptry_reproducer/deptry_reproducer-0.1.0.tar.gz) + + deptry-reproducer==0.1.0 (from file://[WORKSPACE]/test/packages/deptry_reproducer/deptry_reproducer-0.1.0.tar.gz) + pycparser==2.21 "### ); @@ -6112,7 +6112,7 @@ fn already_installed_dependent_editable() { let context = TestContext::new("3.12"); let root_path = context .workspace_root - .join("scripts/packages/dependent_locals"); + .join("test/packages/dependent_locals"); // Install the first editable uv_snapshot!(context.filters(), context.pip_install() @@ -6126,7 +6126,7 @@ fn already_installed_dependent_editable() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + first-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/first_local) + + first-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/first_local) "### ); @@ -6147,7 +6147,7 @@ fn already_installed_dependent_editable() { Resolved 2 packages in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + second-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/second_local) + + second-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/second_local) "### ); @@ -6165,7 +6165,7 @@ fn already_installed_dependent_editable() { Prepared 1 package in [TIME] Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - ~ first-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/first_local) + ~ first-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/first_local) "### ); @@ -6207,7 +6207,7 @@ fn already_installed_dependent_editable() { Prepared 1 package in [TIME] Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - ~ first-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/first_local) + ~ first-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/first_local) "### ); } @@ -6218,7 +6218,7 @@ fn already_installed_local_path_dependent() { let context = TestContext::new("3.12"); let root_path = context .workspace_root - .join("scripts/packages/dependent_locals"); + .join("test/packages/dependent_locals"); // Install the first local uv_snapshot!(context.filters(), context.pip_install() @@ -6231,7 +6231,7 @@ fn already_installed_local_path_dependent() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + first-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/first_local) + + first-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/first_local) "### ); @@ -6251,7 +6251,7 @@ fn already_installed_local_path_dependent() { Resolved 2 packages in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + second-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/second_local) + + second-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/second_local) "### ); @@ -6268,7 +6268,7 @@ fn already_installed_local_path_dependent() { Prepared 1 package in [TIME] Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - ~ first-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/first_local) + ~ first-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/first_local) "### ); @@ -6285,7 +6285,7 @@ fn already_installed_local_path_dependent() { Prepared 1 package in [TIME] Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - ~ first-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/first_local) + ~ first-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/first_local) "### ); @@ -6326,8 +6326,8 @@ fn already_installed_local_path_dependent() { Prepared 2 packages in [TIME] Uninstalled 2 packages in [TIME] Installed 2 packages in [TIME] - ~ first-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/first_local) - ~ second-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/second_local) + ~ first-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/first_local) + ~ second-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/second_local) " ); @@ -6350,7 +6350,7 @@ fn already_installed_local_path_dependent() { Prepared 1 package in [TIME] Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - ~ second-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/second_local) + ~ second-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/second_local) "### ); @@ -6375,8 +6375,8 @@ fn already_installed_local_path_dependent() { Prepared 2 packages in [TIME] Uninstalled 2 packages in [TIME] Installed 2 packages in [TIME] - ~ first-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/first_local) - ~ second-local==0.1.0 (from file://[WORKSPACE]/scripts/packages/dependent_locals/second_local) + ~ first-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/first_local) + ~ second-local==0.1.0 (from file://[WORKSPACE]/test/packages/dependent_locals/second_local) "### ); } @@ -6385,7 +6385,7 @@ fn already_installed_local_path_dependent() { #[test] fn already_installed_local_version_of_remote_package() { let context = TestContext::new("3.12"); - let root_path = context.workspace_root.join("scripts/packages"); + let root_path = context.workspace_root.join("test/packages"); // Install the local anyio first uv_snapshot!(context.filters(), context.pip_install() @@ -6398,7 +6398,7 @@ fn already_installed_local_version_of_remote_package() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + anyio==4.3.0+foo (from file://[WORKSPACE]/scripts/packages/anyio_local) + + anyio==4.3.0+foo (from file://[WORKSPACE]/test/packages/anyio_local) "### ); @@ -6463,7 +6463,7 @@ fn already_installed_local_version_of_remote_package() { Prepared 1 package in [TIME] Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - ~ anyio==4.3.0+foo (from file://[WORKSPACE]/scripts/packages/anyio_local) + ~ anyio==4.3.0+foo (from file://[WORKSPACE]/test/packages/anyio_local) "### ); @@ -6481,7 +6481,7 @@ fn already_installed_local_version_of_remote_package() { Prepared 3 packages in [TIME] Uninstalled 1 package in [TIME] Installed 3 packages in [TIME] - - anyio==4.3.0+foo (from file://[WORKSPACE]/scripts/packages/anyio_local) + - anyio==4.3.0+foo (from file://[WORKSPACE]/test/packages/anyio_local) + anyio==4.3.0 + idna==3.6 + sniffio==1.3.1 @@ -6501,7 +6501,7 @@ fn already_installed_local_version_of_remote_package() { Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - anyio==4.3.0 - + anyio==4.3.0+foo (from file://[WORKSPACE]/scripts/packages/anyio_local) + + anyio==4.3.0+foo (from file://[WORKSPACE]/test/packages/anyio_local) "### ); @@ -6747,7 +6747,7 @@ fn find_links() { uv_snapshot!(context.filters(), context.pip_install() .arg("tqdm") .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")), @r###" + .arg(context.workspace_root.join("test/links/")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -6771,7 +6771,7 @@ fn find_links_no_binary() { .arg("--no-binary") .arg(":all:") .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")), @r###" + .arg(context.workspace_root.join("test/links/")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -6985,7 +6985,7 @@ fn require_hashes_editable() -> Result<()> { let requirements_txt = context.temp_dir.child("requirements.txt"); requirements_txt.write_str(&indoc::formatdoc! {r" - -e file://{workspace_root}/scripts/packages/black_editable[d] + -e file://{workspace_root}/test/packages/black_editable[d] ", workspace_root = context.workspace_root.simplified_display(), })?; @@ -7000,7 +7000,7 @@ fn require_hashes_editable() -> Result<()> { ----- stdout ----- ----- stderr ----- - error: In `--require-hashes` mode, all requirements must have a hash, but none were provided for: file://[WORKSPACE]/scripts/packages/black_editable[d] + error: In `--require-hashes` mode, all requirements must have a hash, but none were provided for: file://[WORKSPACE]/test/packages/black_editable[d] "### ); @@ -7652,7 +7652,7 @@ fn verify_hashes_editable() -> Result<()> { let requirements_txt = context.temp_dir.child("requirements.txt"); requirements_txt.write_str(&indoc::formatdoc! {r" - -e file://{workspace_root}/scripts/packages/black_editable[d] + -e file://{workspace_root}/test/packages/black_editable[d] ", workspace_root = context.workspace_root.simplified_display(), })?; @@ -7673,7 +7673,7 @@ fn verify_hashes_editable() -> Result<()> { + aiohttp==3.9.3 + aiosignal==1.3.1 + attrs==23.2.0 - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) + frozenlist==1.4.1 + idna==3.6 + multidict==6.0.5 @@ -7861,11 +7861,11 @@ fn tool_uv_sources() -> Result<()> { let project_root = fs_err::canonicalize(std::env::current_dir()?.join("../.."))?; fs_err::create_dir_all(context.temp_dir.join("poetry_editable/poetry_editable"))?; fs_err::copy( - project_root.join("scripts/packages/poetry_editable/pyproject.toml"), + project_root.join("test/packages/poetry_editable/pyproject.toml"), context.temp_dir.join("poetry_editable/pyproject.toml"), )?; fs_err::copy( - project_root.join("scripts/packages/poetry_editable/poetry_editable/__init__.py"), + project_root.join("test/packages/poetry_editable/poetry_editable/__init__.py"), context .temp_dir .join("poetry_editable/poetry_editable/__init__.py"), @@ -7995,8 +7995,8 @@ fn prefer_editable() -> Result<()> { uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/black_editable")) - .arg(context.workspace_root.join("scripts/packages/black_editable")), @r###" + .arg(context.workspace_root.join("test/packages/black_editable")) + .arg(context.workspace_root.join("test/packages/black_editable")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -8005,7 +8005,7 @@ fn prefer_editable() -> Result<()> { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) "### ); @@ -8017,13 +8017,13 @@ fn prefer_editable() -> Result<()> { let requirements_txt = context.temp_dir.child("requirements.txt"); requirements_txt.write_str(&format!( - "black @ file://{}/scripts/packages/black_editable", + "black @ file://{}/test/packages/black_editable", context.workspace_root.simplified_display() ))?; uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/black_editable")) + .arg(context.workspace_root.join("test/packages/black_editable")) .arg("-r") .arg("requirements.txt"), @r###" success: true @@ -8034,7 +8034,7 @@ fn prefer_editable() -> Result<()> { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) "### ); @@ -8073,7 +8073,7 @@ fn local_index_absolute() -> Result<()> { - "#, Url::from_directory_path(context.workspace_root.join("scripts/links/")).unwrap().as_str()})?; + "#, Url::from_directory_path(context.workspace_root.join("test/links/")).unwrap().as_str()})?; uv_snapshot!(context.filters(), context.pip_install() .env_remove(EnvVars::UV_EXCLUDE_NEWER) @@ -8124,7 +8124,7 @@ fn local_index_relative() -> Result<()> { - "#, Url::from_directory_path(context.workspace_root.join("scripts/links/")).unwrap().as_str()})?; + "#, Url::from_directory_path(context.workspace_root.join("test/links/")).unwrap().as_str()})?; uv_snapshot!(context.filters(), context.pip_install() .env_remove(EnvVars::UV_EXCLUDE_NEWER) @@ -8175,7 +8175,7 @@ fn local_index_requirements_txt_absolute() -> Result<()> { - "#, Url::from_directory_path(context.workspace_root.join("scripts/links/")).unwrap().as_str()})?; + "#, Url::from_directory_path(context.workspace_root.join("test/links/")).unwrap().as_str()})?; let requirements_txt = context.temp_dir.child("requirements.txt"); requirements_txt.write_str(&indoc::formatdoc! {r" @@ -8231,7 +8231,7 @@ fn local_index_requirements_txt_relative() -> Result<()> { - "#, Url::from_directory_path(context.workspace_root.join("scripts/links/")).unwrap().as_str()})?; + "#, Url::from_directory_path(context.workspace_root.join("test/links/")).unwrap().as_str()})?; let requirements_txt = context.temp_dir.child("requirements.txt"); requirements_txt.write_str( @@ -8405,11 +8405,7 @@ fn install_relocatable() -> Result<()> { // (we use black_editable because it's convenient, but we don't actually install it as editable) context .pip_install() - .arg( - context - .workspace_root - .join("scripts/packages/black_editable"), - ) + .arg(context.workspace_root.join("test/packages/black_editable")) .assert() .success(); @@ -9337,7 +9333,7 @@ fn build_tag() { uv_snapshot!(context.filters(), context.pip_install() .arg("build-tag") .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")), @r###" + .arg(context.workspace_root.join("test/links/")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -10141,7 +10137,7 @@ fn other_sources_group() -> Result<()> { // and install an editable context = new_context()?; uv_snapshot!(context.filters(), context.pip_install() - .arg("-e").arg(context.workspace_root.join("scripts/packages/poetry_editable")) + .arg("-e").arg(context.workspace_root.join("test/packages/poetry_editable")) .arg("--group").arg("foo"), @r" success: true exit_code: 0 @@ -10153,7 +10149,7 @@ fn other_sources_group() -> Result<()> { Installed 5 packages in [TIME] + anyio==4.3.0 + idna==3.6 - + poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable) + + poetry-editable==0.1.0 (from file://[WORKSPACE]/test/packages/poetry_editable) + sniffio==1.3.1 + sortedcontainers==2.4.0 "); @@ -12265,7 +12261,7 @@ fn config_settings_package() -> Result<()> { "-e {}", context .workspace_root - .join("scripts/packages/setuptools_editable") + .join("test/packages/setuptools_editable") .display() ))?; @@ -12282,7 +12278,7 @@ fn config_settings_package() -> Result<()> { Prepared 2 packages in [TIME] Installed 2 packages in [TIME] + iniconfig==2.0.0 - + setuptools-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/setuptools_editable) + + setuptools-editable==0.1.0 (from file://[WORKSPACE]/test/packages/setuptools_editable) "### ); @@ -12301,7 +12297,7 @@ fn config_settings_package() -> Result<()> { ----- stderr ----- Uninstalled 1 package in [TIME] - - setuptools-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/setuptools_editable) + - setuptools-editable==0.1.0 (from file://[WORKSPACE]/test/packages/setuptools_editable) "###); // Install the editable package with `editable_mode=compat`, scoped to the package. @@ -12318,7 +12314,7 @@ fn config_settings_package() -> Result<()> { Resolved 2 packages in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + setuptools-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/setuptools_editable) + + setuptools-editable==0.1.0 (from file://[WORKSPACE]/test/packages/setuptools_editable) " ); @@ -12337,7 +12333,7 @@ fn config_settings_package() -> Result<()> { ----- stderr ----- Uninstalled 1 package in [TIME] - - setuptools-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/setuptools_editable) + - setuptools-editable==0.1.0 (from file://[WORKSPACE]/test/packages/setuptools_editable) "###); // Install the editable package with `editable_mode=compat`, by scoped to a different package. @@ -12354,7 +12350,7 @@ fn config_settings_package() -> Result<()> { ----- stderr ----- Resolved 2 packages in [TIME] Installed 1 package in [TIME] - + setuptools-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/setuptools_editable) + + setuptools-editable==0.1.0 (from file://[WORKSPACE]/test/packages/setuptools_editable) " ); @@ -12852,7 +12848,7 @@ fn pip_install_build_dependencies_respect_locked_versions() -> Result<()> { fn overlapping_packages_warning() -> Result<()> { let context = TestContext::new("3.12"); - let built_by_uv = context.workspace_root.join("scripts/packages/built-by-uv"); + let built_by_uv = context.workspace_root.join("test/packages/built-by-uv"); // Overlaps with `built-by-uv` let also_build_by_uv = context.temp_dir.child("also-built-by-uv"); @@ -12891,7 +12887,7 @@ fn overlapping_packages_warning() -> Result<()> { Prepared 2 packages in [TIME] Installed 2 packages in [TIME] + also-built-by-uv==0.1.0 (from file://[TEMP_DIR]/also-built-by-uv) - + built-by-uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/built-by-uv) + + built-by-uv==0.1.0 (from file://[WORKSPACE]/test/packages/built-by-uv) " ); @@ -12915,7 +12911,7 @@ fn overlapping_packages_warning() -> Result<()> { warning: The module `built_by_uv` is provided by more than one package, which causes an install race condition and can result in a broken module. Consider removing your dependency on either `built-by-uv` (v0.1.0) or `also-built-by-uv` (v0.1.0). Installed 2 packages in [TIME] + also-built-by-uv==0.1.0 (from file://[TEMP_DIR]/also-built-by-uv) - + built-by-uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/built-by-uv) + + built-by-uv==0.1.0 (from file://[WORKSPACE]/test/packages/built-by-uv) " ); @@ -12946,7 +12942,7 @@ fn overlapping_packages_warning() -> Result<()> { ----- stderr ----- Uninstalled 1 package in [TIME] - - built-by-uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/built-by-uv) + - built-by-uv==0.1.0 (from file://[WORKSPACE]/test/packages/built-by-uv) " ); uv_snapshot!(context.filters(), context.pip_uninstall() @@ -12973,7 +12969,7 @@ fn overlapping_packages_warning() -> Result<()> { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + built-by-uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/built-by-uv) + + built-by-uv==0.1.0 (from file://[WORKSPACE]/test/packages/built-by-uv) " ); // Currently, we don't warn if we install them one wheel at a time. diff --git a/crates/uv/tests/it/pip_list.rs b/crates/uv/tests/it/pip_list.rs index 73b3461aa..fc487f8cd 100644 --- a/crates/uv/tests/it/pip_list.rs +++ b/crates/uv/tests/it/pip_list.rs @@ -287,7 +287,7 @@ fn list_editable() { // Install the editable package. uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###" + .arg(context.workspace_root.join("test/packages/poetry_editable")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -298,7 +298,7 @@ fn list_editable() { Installed 4 packages in [TIME] + anyio==4.3.0 + idna==3.6 - + poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable) + + poetry-editable==0.1.0 (from file://[WORKSPACE]/test/packages/poetry_editable) + sniffio==1.3.1 "### ); @@ -317,7 +317,7 @@ fn list_editable() { [UNDERLINE] anyio 4.3.0 idna 3.6 - poetry-editable 0.1.0 [WORKSPACE]/scripts/packages/poetry_editable + poetry-editable 0.1.0 [WORKSPACE]/test/packages/poetry_editable sniffio 1.3.1 ----- stderr ----- @@ -333,7 +333,7 @@ fn list_editable_only() { // Install the editable package. uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###" + .arg(context.workspace_root.join("test/packages/poetry_editable")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -344,7 +344,7 @@ fn list_editable_only() { Installed 4 packages in [TIME] + anyio==4.3.0 + idna==3.6 - + poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable) + + poetry-editable==0.1.0 (from file://[WORKSPACE]/test/packages/poetry_editable) + sniffio==1.3.1 "### ); @@ -362,7 +362,7 @@ fn list_editable_only() { ----- stdout ----- Package Version Editable project location [UNDERLINE] - poetry-editable 0.1.0 [WORKSPACE]/scripts/packages/poetry_editable + poetry-editable 0.1.0 [WORKSPACE]/test/packages/poetry_editable ----- stderr ----- "### @@ -408,7 +408,7 @@ fn list_exclude() { // Install the editable package. uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###" + .arg(context.workspace_root.join("test/packages/poetry_editable")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -419,7 +419,7 @@ fn list_exclude() { Installed 4 packages in [TIME] + anyio==4.3.0 + idna==3.6 - + poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable) + + poetry-editable==0.1.0 (from file://[WORKSPACE]/test/packages/poetry_editable) + sniffio==1.3.1 "### ); @@ -440,7 +440,7 @@ fn list_exclude() { [UNDERLINE] anyio 4.3.0 idna 3.6 - poetry-editable 0.1.0 [WORKSPACE]/scripts/packages/poetry_editable + poetry-editable 0.1.0 [WORKSPACE]/test/packages/poetry_editable sniffio 1.3.1 ----- stderr ----- @@ -491,7 +491,7 @@ fn list_format_json() { // Install the editable package. uv_snapshot!(context.filters(), context.pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###" + .arg(context.workspace_root.join("test/packages/poetry_editable")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -502,7 +502,7 @@ fn list_format_json() { Installed 4 packages in [TIME] + anyio==4.3.0 + idna==3.6 - + poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable) + + poetry-editable==0.1.0 (from file://[WORKSPACE]/test/packages/poetry_editable) + sniffio==1.3.1 "### ); @@ -518,7 +518,7 @@ fn list_format_json() { success: true exit_code: 0 ----- stdout ----- - [{"name":"anyio","version":"4.3.0"},{"name":"idna","version":"3.6"},{"name":"poetry-editable","version":"0.1.0","editable_project_location":"[WORKSPACE]/scripts/packages/poetry_editable"},{"name":"sniffio","version":"1.3.1"}] + [{"name":"anyio","version":"4.3.0"},{"name":"idna","version":"3.6"},{"name":"poetry-editable","version":"0.1.0","editable_project_location":"[WORKSPACE]/test/packages/poetry_editable"},{"name":"sniffio","version":"1.3.1"}] ----- stderr ----- "### @@ -530,7 +530,7 @@ fn list_format_json() { success: true exit_code: 0 ----- stdout ----- - [{"name":"poetry-editable","version":"0.1.0","editable_project_location":"[WORKSPACE]/scripts/packages/poetry_editable"}] + [{"name":"poetry-editable","version":"0.1.0","editable_project_location":"[WORKSPACE]/test/packages/poetry_editable"}] ----- stderr ----- "### @@ -558,7 +558,7 @@ fn list_format_freeze() { uv_snapshot!(context.filters(), context .pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###" + .arg(context.workspace_root.join("test/packages/poetry_editable")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -569,7 +569,7 @@ fn list_format_freeze() { Installed 4 packages in [TIME] + anyio==4.3.0 + idna==3.6 - + poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable) + + poetry-editable==0.1.0 (from file://[WORKSPACE]/test/packages/poetry_editable) + sniffio==1.3.1 "### ); @@ -724,7 +724,7 @@ fn list_ignores_quiet_flag_format_freeze() { uv_snapshot!(context.filters(), context .pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/poetry_editable")), @r###" + .arg(context.workspace_root.join("test/packages/poetry_editable")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -735,7 +735,7 @@ fn list_ignores_quiet_flag_format_freeze() { Installed 4 packages in [TIME] + anyio==4.3.0 + idna==3.6 - + poetry-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/poetry_editable) + + poetry-editable==0.1.0 (from file://[WORKSPACE]/test/packages/poetry_editable) + sniffio==1.3.1 "### ); diff --git a/crates/uv/tests/it/pip_show.rs b/crates/uv/tests/it/pip_show.rs index 7ed3919a0..a44dd18f8 100644 --- a/crates/uv/tests/it/pip_show.rs +++ b/crates/uv/tests/it/pip_show.rs @@ -384,7 +384,7 @@ fn show_editable() -> Result<()> { context .pip_install() .arg("-e") - .arg("../../scripts/packages/poetry_editable") + .arg("../../test/packages/poetry_editable") .current_dir(current_dir()?) .env( EnvVars::CARGO_TARGET_DIR, @@ -401,7 +401,7 @@ fn show_editable() -> Result<()> { Name: poetry-editable Version: 0.1.0 Location: [SITE_PACKAGES]/ - Editable project location: [WORKSPACE]/scripts/packages/poetry_editable + Editable project location: [WORKSPACE]/test/packages/poetry_editable Requires: anyio Required-by: diff --git a/crates/uv/tests/it/pip_sync.rs b/crates/uv/tests/it/pip_sync.rs index 57f718a98..17c5caf8e 100644 --- a/crates/uv/tests/it/pip_sync.rs +++ b/crates/uv/tests/it/pip_sync.rs @@ -776,7 +776,7 @@ fn install_sdist_archive_type_bz2() -> Result<()> { "bz2 @ {}", context .workspace_root - .join("scripts/links/bz2-1.0.0.tar.bz2") + .join("test/links/bz2-1.0.0.tar.bz2") .display() ))?; @@ -791,7 +791,7 @@ fn install_sdist_archive_type_bz2() -> Result<()> { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + bz2==1.0.0 (from file://[WORKSPACE]/scripts/links/bz2-1.0.0.tar.bz2) + + bz2==1.0.0 (from file://[WORKSPACE]/test/links/bz2-1.0.0.tar.bz2) "### ); @@ -2263,9 +2263,7 @@ fn sync_editable() -> Result<()> { // Copy into the temporary directory so we can mutate it. copy_dir_all( - context - .workspace_root - .join("scripts/packages/poetry_editable"), + context.workspace_root.join("test/packages/poetry_editable"), &poetry_editable, )?; @@ -2429,9 +2427,7 @@ fn sync_editable_and_registry() -> Result<()> { // Copy the black test editable into the "current" directory copy_dir_all( - context - .workspace_root - .join("scripts/packages/black_editable"), + context.workspace_root.join("test/packages/black_editable"), context.temp_dir.join("black_editable"), )?; @@ -2544,9 +2540,7 @@ fn sync_editable_and_local() -> Result<()> { // Copy the black test editable into the "current" directory copy_dir_all( - context - .workspace_root - .join("scripts/packages/black_editable"), + context.workspace_root.join("test/packages/black_editable"), context.temp_dir.join("black_editable"), )?; @@ -2687,7 +2681,7 @@ fn find_links() -> Result<()> { uv_snapshot!(context.filters(), context.pip_sync() .arg("requirements.txt") .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")), @r###" + .arg(context.workspace_root.join("test/links/")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -2720,7 +2714,7 @@ fn find_links_no_index_match() -> Result<()> { .arg("requirements.txt") .arg("--no-index") .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")), @r###" + .arg(context.workspace_root.join("test/links/")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -2750,7 +2744,7 @@ fn find_links_offline_match() -> Result<()> { .arg("requirements.txt") .arg("--offline") .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")), @r###" + .arg(context.workspace_root.join("test/links/")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -2781,7 +2775,7 @@ fn find_links_offline_no_match() -> Result<()> { .arg("requirements.txt") .arg("--offline") .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")), @r###" + .arg(context.workspace_root.join("test/links/")), @r###" success: false exit_code: 1 ----- stdout ----- @@ -2811,7 +2805,7 @@ fn find_links_wheel_cache() -> Result<()> { uv_snapshot!(context.filters(), context.pip_sync() .arg("requirements.txt") .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")), @r###" + .arg(context.workspace_root.join("test/links/")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -2829,7 +2823,7 @@ fn find_links_wheel_cache() -> Result<()> { .arg("requirements.txt") .arg("--reinstall") .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")), @r###" + .arg(context.workspace_root.join("test/links/")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -2861,7 +2855,7 @@ fn find_links_source_cache() -> Result<()> { uv_snapshot!(context.filters(), context.pip_sync() .arg("requirements.txt") .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")), @r###" + .arg(context.workspace_root.join("test/links/")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -2879,7 +2873,7 @@ fn find_links_source_cache() -> Result<()> { .arg("requirements.txt") .arg("--reinstall") .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")), @r###" + .arg(context.workspace_root.join("test/links/")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -4045,7 +4039,7 @@ fn require_hashes_source_tree() -> Result<()> { "black @ {} --hash=sha256:f7ed51751b2c2add651e5747c891b47e26d2a21be5d32d9311dfe9692f3e5d7a", context .workspace_root - .join("scripts/packages/black_editable") + .join("test/packages/black_editable") .display() ))?; @@ -4057,8 +4051,8 @@ fn require_hashes_source_tree() -> Result<()> { ----- stdout ----- ----- stderr ----- - × Failed to build `black @ file://[WORKSPACE]/scripts/packages/black_editable` - ╰─▶ Hash-checking is not supported for local directories: `black @ file://[WORKSPACE]/scripts/packages/black_editable` + × Failed to build `black @ file://[WORKSPACE]/test/packages/black_editable` + ╰─▶ Hash-checking is not supported for local directories: `black @ file://[WORKSPACE]/test/packages/black_editable` "### ); @@ -4149,7 +4143,7 @@ fn require_hashes_wheel_path() -> Result<()> { "tqdm @ {} --hash=sha256:a34996d4bd5abb2336e14ff0a2d22b92cfd0f0ed344e6883041ce01953276a13", context .workspace_root - .join("scripts/links/tqdm-1000.0.0-py3-none-any.whl") + .join("test/links/tqdm-1000.0.0-py3-none-any.whl") .display() ))?; @@ -4164,7 +4158,7 @@ fn require_hashes_wheel_path() -> Result<()> { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + tqdm==1000.0.0 (from file://[WORKSPACE]/scripts/links/tqdm-1000.0.0-py3-none-any.whl) + + tqdm==1000.0.0 (from file://[WORKSPACE]/test/links/tqdm-1000.0.0-py3-none-any.whl) "### ); @@ -4181,7 +4175,7 @@ fn require_hashes_wheel_path_mismatch() -> Result<()> { "tqdm @ {} --hash=sha256:cfdb2b588b9fc25ede96d8db56ed50848b0b649dca3dd1df0b11f683bb9e0b5f", context .workspace_root - .join("scripts/links/tqdm-1000.0.0-py3-none-any.whl") + .join("test/links/tqdm-1000.0.0-py3-none-any.whl") .display() ))?; @@ -4194,8 +4188,8 @@ fn require_hashes_wheel_path_mismatch() -> Result<()> { ----- stderr ----- Resolved 1 package in [TIME] - × Failed to read `tqdm @ file://[WORKSPACE]/scripts/links/tqdm-1000.0.0-py3-none-any.whl` - ╰─▶ Hash mismatch for `tqdm @ file://[WORKSPACE]/scripts/links/tqdm-1000.0.0-py3-none-any.whl` + × Failed to read `tqdm @ file://[WORKSPACE]/test/links/tqdm-1000.0.0-py3-none-any.whl` + ╰─▶ Hash mismatch for `tqdm @ file://[WORKSPACE]/test/links/tqdm-1000.0.0-py3-none-any.whl` Expected: sha256:cfdb2b588b9fc25ede96d8db56ed50848b0b649dca3dd1df0b11f683bb9e0b5f @@ -4218,7 +4212,7 @@ fn require_hashes_source_path() -> Result<()> { "tqdm @ {} --hash=sha256:89fa05cffa7f457658373b85de302d24d0c205ceda2819a8739e324b75e9430b", context .workspace_root - .join("scripts/links/tqdm-999.0.0.tar.gz") + .join("test/links/tqdm-999.0.0.tar.gz") .display() ))?; @@ -4233,7 +4227,7 @@ fn require_hashes_source_path() -> Result<()> { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + tqdm==999.0.0 (from file://[WORKSPACE]/scripts/links/tqdm-999.0.0.tar.gz) + + tqdm==999.0.0 (from file://[WORKSPACE]/test/links/tqdm-999.0.0.tar.gz) "### ); @@ -4250,7 +4244,7 @@ fn require_hashes_source_path_mismatch() -> Result<()> { "tqdm @ {} --hash=sha256:cfdb2b588b9fc25ede96d8db56ed50848b0b649dca3dd1df0b11f683bb9e0b5f", context .workspace_root - .join("scripts/links/tqdm-999.0.0.tar.gz") + .join("test/links/tqdm-999.0.0.tar.gz") .display() ))?; @@ -4262,8 +4256,8 @@ fn require_hashes_source_path_mismatch() -> Result<()> { ----- stdout ----- ----- stderr ----- - × Failed to build `tqdm @ file://[WORKSPACE]/scripts/links/tqdm-999.0.0.tar.gz` - ╰─▶ Hash mismatch for `tqdm @ file://[WORKSPACE]/scripts/links/tqdm-999.0.0.tar.gz` + × Failed to build `tqdm @ file://[WORKSPACE]/test/links/tqdm-999.0.0.tar.gz` + ╰─▶ Hash mismatch for `tqdm @ file://[WORKSPACE]/test/links/tqdm-999.0.0.tar.gz` Expected: sha256:cfdb2b588b9fc25ede96d8db56ed50848b0b649dca3dd1df0b11f683bb9e0b5f @@ -4312,7 +4306,7 @@ fn require_hashes_editable() -> Result<()> { let requirements_txt = context.temp_dir.child("requirements.txt"); requirements_txt.write_str(&indoc::formatdoc! {r" - -e file://{workspace_root}/scripts/packages/black_editable[d] + -e file://{workspace_root}/test/packages/black_editable[d] ", workspace_root = context.workspace_root.simplified_display(), })?; @@ -4326,7 +4320,7 @@ fn require_hashes_editable() -> Result<()> { ----- stdout ----- ----- stderr ----- - error: In `--require-hashes` mode, all requirements must have a hash, but none were provided for: file://[WORKSPACE]/scripts/packages/black_editable[d] + error: In `--require-hashes` mode, all requirements must have a hash, but none were provided for: file://[WORKSPACE]/test/packages/black_editable[d] "### ); diff --git a/crates/uv/tests/it/pip_tree.rs b/crates/uv/tests/it/pip_tree.rs index 83f0de711..dcb975564 100644 --- a/crates/uv/tests/it/pip_tree.rs +++ b/crates/uv/tests/it/pip_tree.rs @@ -827,7 +827,7 @@ fn with_editable() { uv_snapshot!(context.filters(), context .pip_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/hatchling_editable")), @r###" + .arg(context.workspace_root.join("test/packages/hatchling_editable")), @r###" success: true exit_code: 0 ----- stdout ----- @@ -836,7 +836,7 @@ fn with_editable() { Resolved 2 packages in [TIME] Prepared 2 packages in [TIME] Installed 2 packages in [TIME] - + hatchling-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/hatchling_editable) + + hatchling-editable==0.1.0 (from file://[WORKSPACE]/test/packages/hatchling_editable) + iniconfig==2.0.1.dev6+g9cae431 (from git+https://github.com/pytest-dev/iniconfig@9cae43103df70bac6fde7b9f35ad11a9f1be0cb4) "### ); diff --git a/crates/uv/tests/it/pip_uninstall.rs b/crates/uv/tests/it/pip_uninstall.rs index fdcd4e249..52a2865e8 100644 --- a/crates/uv/tests/it/pip_uninstall.rs +++ b/crates/uv/tests/it/pip_uninstall.rs @@ -176,7 +176,7 @@ fn uninstall_editable_by_name() -> Result<()> { "-e {}", context .workspace_root - .join("scripts/packages/flit_editable") + .join("test/packages/flit_editable") .as_os_str() .to_str() .expect("Path is valid unicode") @@ -198,7 +198,7 @@ fn uninstall_editable_by_name() -> Result<()> { ----- stderr ----- Uninstalled 1 package in [TIME] - - flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable) + - flit-editable==0.1.0 (from file://[WORKSPACE]/test/packages/flit_editable) "### ); @@ -216,7 +216,7 @@ fn uninstall_by_path() -> Result<()> { requirements_txt.write_str( context .workspace_root - .join("scripts/packages/flit_editable") + .join("test/packages/flit_editable") .as_os_str() .to_str() .expect("Path is valid unicode"), @@ -232,14 +232,14 @@ fn uninstall_by_path() -> Result<()> { // Uninstall the editable by path. uv_snapshot!(context.filters(), context.pip_uninstall() - .arg(context.workspace_root.join("scripts/packages/flit_editable")), @r###" + .arg(context.workspace_root.join("test/packages/flit_editable")), @r###" success: true exit_code: 0 ----- stdout ----- ----- stderr ----- Uninstalled 1 package in [TIME] - - flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable) + - flit-editable==0.1.0 (from file://[WORKSPACE]/test/packages/flit_editable) "### ); @@ -257,7 +257,7 @@ fn uninstall_duplicate_by_path() -> Result<()> { requirements_txt.write_str( context .workspace_root - .join("scripts/packages/flit_editable") + .join("test/packages/flit_editable") .as_os_str() .to_str() .expect("Path is valid unicode"), @@ -274,14 +274,14 @@ fn uninstall_duplicate_by_path() -> Result<()> { // Uninstall the editable by both path and name. uv_snapshot!(context.filters(), context.pip_uninstall() .arg("flit-editable") - .arg(context.workspace_root.join("scripts/packages/flit_editable")), @r###" + .arg(context.workspace_root.join("test/packages/flit_editable")), @r###" success: true exit_code: 0 ----- stdout ----- ----- stderr ----- Uninstalled 1 package in [TIME] - - flit-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/flit_editable) + - flit-editable==0.1.0 (from file://[WORKSPACE]/test/packages/flit_editable) "### ); diff --git a/crates/uv/tests/it/publish.rs b/crates/uv/tests/it/publish.rs index 9864fb9e2..a83c124ab 100644 --- a/crates/uv/tests/it/publish.rs +++ b/crates/uv/tests/it/publish.rs @@ -23,7 +23,7 @@ fn username_password_no_longer_supported() { .arg("dummy") .arg("--publish-url") .arg("https://test.pypi.org/legacy/") - .arg("../../scripts/links/ok-1.0.0-py3-none-any.whl"), @r###" + .arg("../../test/links/ok-1.0.0-py3-none-any.whl"), @r###" success: false exit_code: 2 ----- stdout ----- @@ -31,7 +31,7 @@ fn username_password_no_longer_supported() { ----- stderr ----- Publishing 1 file to https://test.pypi.org/legacy/ Uploading ok-1.0.0-py3-none-any.whl ([SIZE]) - error: Failed to publish `../../scripts/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/ + error: Failed to publish `../../test/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/ Caused by: Upload failed with status code 403 Forbidden. Server says: 403 Username/Password authentication is no longer supported. Migrate to API Tokens or Trusted Publishers instead. See https://test.pypi.org/help/#apitoken and https://test.pypi.org/help/#trusted-publishers "### ); @@ -48,7 +48,7 @@ fn invalid_token() { .arg("dummy") .arg("--publish-url") .arg("https://test.pypi.org/legacy/") - .arg("../../scripts/links/ok-1.0.0-py3-none-any.whl"), @r###" + .arg("../../test/links/ok-1.0.0-py3-none-any.whl"), @r###" success: false exit_code: 2 ----- stdout ----- @@ -56,7 +56,7 @@ fn invalid_token() { ----- stderr ----- Publishing 1 file to https://test.pypi.org/legacy/ Uploading ok-1.0.0-py3-none-any.whl ([SIZE]) - error: Failed to publish `../../scripts/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/ + error: Failed to publish `../../test/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/ Caused by: Upload failed with status code 403 Forbidden. Server says: 403 Invalid or non-existent authentication information. See https://test.pypi.org/help/#invalid-auth for more information. "### ); @@ -76,7 +76,7 @@ fn mixed_credentials() { .arg("https://test.pypi.org/legacy/") .arg("--trusted-publishing") .arg("always") - .arg("../../scripts/links/ok-1.0.0-py3-none-any.whl") + .arg("../../test/links/ok-1.0.0-py3-none-any.whl") // Emulate CI .env(EnvVars::GITHUB_ACTIONS, "true"), @r###" success: false @@ -100,7 +100,7 @@ fn missing_trusted_publishing_permission() { .arg("https://test.pypi.org/legacy/") .arg("--trusted-publishing") .arg("always") - .arg("../../scripts/links/ok-1.0.0-py3-none-any.whl") + .arg("../../test/links/ok-1.0.0-py3-none-any.whl") // Emulate CI .env(EnvVars::GITHUB_ACTIONS, "true"), @r" success: false @@ -126,7 +126,7 @@ fn no_credentials() { uv_snapshot!(context.filters(), context.publish() .arg("--publish-url") .arg("https://test.pypi.org/legacy/") - .arg("../../scripts/links/ok-1.0.0-py3-none-any.whl") + .arg("../../test/links/ok-1.0.0-py3-none-any.whl") // Emulate CI .env(EnvVars::GITHUB_ACTIONS, "true"), @r" success: false @@ -141,7 +141,7 @@ fn no_credentials() { Caused by: GitHub Actions detection error Caused by: insufficient permissions: missing ACTIONS_ID_TOKEN_REQUEST_URL Uploading ok-1.0.0-py3-none-any.whl ([SIZE]) - error: Failed to publish `../../scripts/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/ + error: Failed to publish `../../test/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/ Caused by: Failed to send POST request Caused by: Missing credentials for https://test.pypi.org/legacy/ " @@ -211,7 +211,7 @@ fn check_keyring_behaviours() { .arg( context .workspace_root - .join("scripts") + .join("test") .join("packages") .join("keyring_test_plugin"), ) @@ -230,7 +230,7 @@ fn check_keyring_behaviours() { .arg("https://test.pypi.org/simple/") .arg("--publish-url") .arg("https://test.pypi.org/legacy/?ok") - .arg("../../scripts/links/ok-1.0.0-py3-none-any.whl") + .arg("../../test/links/ok-1.0.0-py3-none-any.whl") .env(EnvVars::PATH, venv_bin_path(&context.venv)), @r###" success: false exit_code: 2 @@ -239,7 +239,7 @@ fn check_keyring_behaviours() { ----- stderr ----- Publishing 1 file to https://test.pypi.org/legacy/?ok Uploading ok-1.0.0-py3-none-any.whl ([SIZE]) - error: Failed to publish `../../scripts/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/?ok + error: Failed to publish `../../test/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/?ok Caused by: Upload failed with status code 403 Forbidden. Server says: 403 Username/Password authentication is no longer supported. Migrate to API Tokens or Trusted Publishers instead. See https://test.pypi.org/help/#apitoken and https://test.pypi.org/help/#trusted-publishers "### ); @@ -254,7 +254,7 @@ fn check_keyring_behaviours() { .arg("subprocess") .arg("--publish-url") .arg("https://test.pypi.org/legacy/?ok") - .arg("../../scripts/links/ok-1.0.0-py3-none-any.whl") + .arg("../../test/links/ok-1.0.0-py3-none-any.whl") .env(EnvVars::PATH, venv_bin_path(&context.venv)), @r###" success: false exit_code: 2 @@ -264,7 +264,7 @@ fn check_keyring_behaviours() { Publishing 1 file to https://test.pypi.org/legacy/?ok warning: Using `--keyring-provider` with a password or token and no check URL has no effect Uploading ok-1.0.0-py3-none-any.whl ([SIZE]) - error: Failed to publish `../../scripts/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/?ok + error: Failed to publish `../../test/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/?ok Caused by: Upload failed with status code 403 Forbidden. Server says: 403 Username/Password authentication is no longer supported. Migrate to API Tokens or Trusted Publishers instead. See https://test.pypi.org/help/#apitoken and https://test.pypi.org/help/#trusted-publishers "### ); @@ -280,7 +280,7 @@ fn check_keyring_behaviours() { .arg("https://test.pypi.org/simple/") .arg("--publish-url") .arg("https://test.pypi.org/legacy/?ok") - .arg("../../scripts/links/ok-1.0.0-py3-none-any.whl") + .arg("../../test/links/ok-1.0.0-py3-none-any.whl") .env(EnvVars::PATH, venv_bin_path(&context.venv)), @r" success: false exit_code: 2 @@ -294,7 +294,7 @@ fn check_keyring_behaviours() { Uploading ok-1.0.0-py3-none-any.whl ([SIZE]) Keyring request for dummy@https://test.pypi.org/legacy/?ok Keyring request for dummy@test.pypi.org - error: Failed to publish `../../scripts/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/?ok + error: Failed to publish `../../test/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/?ok Caused by: Upload failed with status code 403 Forbidden. Server says: 403 Username/Password authentication is no longer supported. Migrate to API Tokens or Trusted Publishers instead. See https://test.pypi.org/help/#apitoken and https://test.pypi.org/help/#trusted-publishers " ); @@ -308,7 +308,7 @@ fn check_keyring_behaviours() { .arg("subprocess") .arg("--publish-url") .arg("https://test.pypi.org/legacy/?ok") - .arg("../../scripts/links/ok-1.0.0-py3-none-any.whl") + .arg("../../test/links/ok-1.0.0-py3-none-any.whl") .env(EnvVars::KEYRING_TEST_CREDENTIALS, r#"{"https://test.pypi.org/legacy/?ok": {"dummy": "dummy"}}"#) .env(EnvVars::PATH, venv_bin_path(&context.venv)), @r" success: false @@ -319,7 +319,7 @@ fn check_keyring_behaviours() { Publishing 1 file to https://test.pypi.org/legacy/?ok Keyring request for dummy@https://test.pypi.org/legacy/?ok Uploading ok-1.0.0-py3-none-any.whl ([SIZE]) - error: Failed to publish `../../scripts/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/?ok + error: Failed to publish `../../test/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/?ok Caused by: Upload failed with status code 403 Forbidden. Server says: 403 Username/Password authentication is no longer supported. Migrate to API Tokens or Trusted Publishers instead. See https://test.pypi.org/help/#apitoken and https://test.pypi.org/help/#trusted-publishers " ); @@ -351,7 +351,7 @@ fn invalid_index() { let ok_wheel = current_dir() .unwrap() - .join("../../scripts/links/ok-1.0.0-py3-none-any.whl"); + .join("../../test/links/ok-1.0.0-py3-none-any.whl"); // No such index uv_snapshot!(context.filters(), context.publish() @@ -537,7 +537,7 @@ async fn gitlab_trusted_publishing_pypi_id_token() { .arg("always") .arg("--publish-url") .arg(format!("{}/upload", server.uri())) - .arg("../../scripts/links/ok-1.0.0-py3-none-any.whl") + .arg("../../test/links/ok-1.0.0-py3-none-any.whl") .env(EnvVars::GITLAB_CI, "true") .env_remove(EnvVars::GITHUB_ACTIONS) .env(EnvVars::PYPI_ID_TOKEN, "gitlab-oidc-jwt"), @r" @@ -591,7 +591,7 @@ async fn gitlab_trusted_publishing_testpypi_id_token() { .arg("always") .arg("--publish-url") .arg(format!("{}/upload", server.uri())) - .arg("../../scripts/links/ok-1.0.0-py3-none-any.whl") + .arg("../../test/links/ok-1.0.0-py3-none-any.whl") // Emulate GitLab CI with TESTPYPI_ID_TOKEN present .env(EnvVars::GITLAB_CI, "true") .env_remove(EnvVars::GITHUB_ACTIONS) diff --git a/crates/uv/tests/it/python_module.rs b/crates/uv/tests/it/python_module.rs index 7eec30823..2aa63f8c9 100644 --- a/crates/uv/tests/it/python_module.rs +++ b/crates/uv/tests/it/python_module.rs @@ -43,7 +43,7 @@ fn find_uv_bin_venv() { // Install in a virtual environment uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/packages/fake-uv")), @r" + .arg(context.workspace_root.join("test/packages/fake-uv")), @r" success: true exit_code: 0 ----- stdout ----- @@ -52,7 +52,7 @@ fn find_uv_bin_venv() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -83,7 +83,7 @@ fn find_uv_bin_target() { // Install in a target directory uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/packages/fake-uv")) + .arg(context.workspace_root.join("test/packages/fake-uv")) .arg("--target") .arg("target"), @r" success: true @@ -95,7 +95,7 @@ fn find_uv_bin_target() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -129,7 +129,7 @@ fn find_uv_bin_prefix() { let prefix = context.temp_dir.child("prefix"); uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/packages/fake-uv")) + .arg(context.workspace_root.join("test/packages/fake-uv")) .arg("--prefix") .arg(prefix.path()), @r" success: true @@ -141,7 +141,7 @@ fn find_uv_bin_prefix() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -183,7 +183,7 @@ fn find_uv_bin_base_prefix() { uv_snapshot!(context.filters(), context.pip_install() .arg("--python") .arg(base_venv.path()) - .arg(context.workspace_root.join("scripts/packages/fake-uv")), @r" + .arg(context.workspace_root.join("test/packages/fake-uv")), @r" success: true exit_code: 0 ----- stdout ----- @@ -193,7 +193,7 @@ fn find_uv_bin_base_prefix() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -239,7 +239,7 @@ fn find_uv_bin_in_ephemeral_environment() -> anyhow::Result<()> { // We should find the binary in an ephemeral `--with` environment uv_snapshot!(context.filters(), context.run() .arg("--with") - .arg(context.workspace_root.join("scripts/packages/fake-uv")) + .arg(context.workspace_root.join("test/packages/fake-uv")) .arg("python") .arg("-c") .arg(TEST_SCRIPT), @r" @@ -254,7 +254,7 @@ fn find_uv_bin_in_ephemeral_environment() -> anyhow::Result<()> { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -284,7 +284,7 @@ fn find_uv_bin_in_parent_of_ephemeral_environment() -> anyhow::Result<()> { [tool.uv.sources] uv = {{ path = "{}" }} "#, - context.workspace_root.join("scripts/packages/fake-uv").portable_display() + context.workspace_root.join("test/packages/fake-uv").portable_display() })?; // When running in an ephemeral environment, we should find the binary in the project @@ -305,7 +305,7 @@ fn find_uv_bin_in_parent_of_ephemeral_environment() -> anyhow::Result<()> { Resolved 2 packages in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) Resolved 3 packages in [TIME] Prepared 3 packages in [TIME] Installed 3 packages in [TIME] @@ -346,7 +346,7 @@ fn find_uv_bin_user_bin() { // Install in a virtual environment uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/packages/fake-uv")), @r" + .arg(context.workspace_root.join("test/packages/fake-uv")), @r" success: true exit_code: 0 ----- stdout ----- @@ -355,7 +355,7 @@ fn find_uv_bin_user_bin() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -430,7 +430,7 @@ fn find_uv_bin_error_message() { // Install in a virtual environment uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/packages/fake-uv")), @r" + .arg(context.workspace_root.join("test/packages/fake-uv")), @r" success: true exit_code: 0 ----- stdout ----- @@ -439,7 +439,7 @@ fn find_uv_bin_error_message() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -486,7 +486,7 @@ fn find_uv_bin_py38() { // Install in a virtual environment uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/packages/fake-uv")), @r" + .arg(context.workspace_root.join("test/packages/fake-uv")), @r" success: true exit_code: 0 ----- stdout ----- @@ -495,7 +495,7 @@ fn find_uv_bin_py38() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -526,7 +526,7 @@ fn find_uv_bin_py39() { // Install in a virtual environment uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/packages/fake-uv")), @r" + .arg(context.workspace_root.join("test/packages/fake-uv")), @r" success: true exit_code: 0 ----- stdout ----- @@ -535,7 +535,7 @@ fn find_uv_bin_py39() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -566,7 +566,7 @@ fn find_uv_bin_py310() { // Install in a virtual environment uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/packages/fake-uv")), @r" + .arg(context.workspace_root.join("test/packages/fake-uv")), @r" success: true exit_code: 0 ----- stdout ----- @@ -575,7 +575,7 @@ fn find_uv_bin_py310() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -606,7 +606,7 @@ fn find_uv_bin_py311() { // Install in a virtual environment uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/packages/fake-uv")), @r" + .arg(context.workspace_root.join("test/packages/fake-uv")), @r" success: true exit_code: 0 ----- stdout ----- @@ -615,7 +615,7 @@ fn find_uv_bin_py311() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -646,7 +646,7 @@ fn find_uv_bin_py312() { // Install in a virtual environment uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/packages/fake-uv")), @r" + .arg(context.workspace_root.join("test/packages/fake-uv")), @r" success: true exit_code: 0 ----- stdout ----- @@ -655,7 +655,7 @@ fn find_uv_bin_py312() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -686,7 +686,7 @@ fn find_uv_bin_py313() { // Install in a virtual environment uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/packages/fake-uv")), @r" + .arg(context.workspace_root.join("test/packages/fake-uv")), @r" success: true exit_code: 0 ----- stdout ----- @@ -695,7 +695,7 @@ fn find_uv_bin_py313() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); @@ -726,7 +726,7 @@ fn find_uv_bin_py314() { // Install in a virtual environment uv_snapshot!(context.filters(), context.pip_install() - .arg(context.workspace_root.join("scripts/packages/fake-uv")), @r" + .arg(context.workspace_root.join("test/packages/fake-uv")), @r" success: true exit_code: 0 ----- stdout ----- @@ -735,7 +735,7 @@ fn find_uv_bin_py314() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + uv==0.1.0 (from file://[WORKSPACE]/scripts/packages/fake-uv) + + uv==0.1.0 (from file://[WORKSPACE]/test/packages/fake-uv) " ); diff --git a/crates/uv/tests/it/run.rs b/crates/uv/tests/it/run.rs index 69dd2ed3b..2350b178a 100644 --- a/crates/uv/tests/it/run.rs +++ b/crates/uv/tests/it/run.rs @@ -1813,15 +1813,13 @@ fn run_with_editable() -> Result<()> { let anyio_local = context.temp_dir.child("src").child("anyio_local"); copy_dir_all( - context.workspace_root.join("scripts/packages/anyio_local"), + context.workspace_root.join("test/packages/anyio_local"), &anyio_local, )?; let black_editable = context.temp_dir.child("src").child("black_editable"); copy_dir_all( - context - .workspace_root - .join("scripts/packages/black_editable"), + context.workspace_root.join("test/packages/black_editable"), &black_editable, )?; diff --git a/crates/uv/tests/it/sync.rs b/crates/uv/tests/it/sync.rs index d73d99062..654048a2d 100644 --- a/crates/uv/tests/it/sync.rs +++ b/crates/uv/tests/it/sync.rs @@ -2304,7 +2304,7 @@ fn sync_extra_build_dependencies_setuptools() -> Result<()> { fn sync_extra_build_dependencies_sources() -> Result<()> { let context = TestContext::new("3.12").with_filtered_counts(); - let anyio_local = context.workspace_root.join("scripts/packages/anyio_local"); + let anyio_local = context.workspace_root.join("test/packages/anyio_local"); // Write a test package that arbitrarily requires `anyio` at a specific _path_ at build time let child = context.temp_dir.child("child"); @@ -2536,7 +2536,7 @@ fn sync_extra_build_dependencies_index() -> Result<()> { fn sync_extra_build_dependencies_sources_from_child() -> Result<()> { let context = TestContext::new("3.12").with_filtered_counts(); - let anyio_local = context.workspace_root.join("scripts/packages/anyio_local"); + let anyio_local = context.workspace_root.join("test/packages/anyio_local"); // Write a test package that arbitrarily requires `anyio` at a specific _path_ at build time let child = context.temp_dir.child("child"); @@ -2882,7 +2882,7 @@ fn sync_relative_wheel() -> Result<()> { context.temp_dir.child("wheels").create_dir_all()?; fs_err::copy( - "../../scripts/links/ok-1.0.0-py3-none-any.whl", + "../../test/links/ok-1.0.0-py3-none-any.whl", context.temp_dir.join("wheels/ok-1.0.0-py3-none-any.whl"), )?; @@ -5856,7 +5856,7 @@ fn sync_extra_build_dependencies_script() -> Result<()> { #[test] fn sync_extra_build_dependencies_script_sources() -> Result<()> { let context = TestContext::new("3.12").with_filtered_counts(); - let anyio_local = context.workspace_root.join("scripts/packages/anyio_local"); + let anyio_local = context.workspace_root.join("test/packages/anyio_local"); // Write a test package that arbitrarily requires `anyio` at a specific _path_ at build time let child = context.temp_dir.child("child"); @@ -10263,7 +10263,7 @@ fn sync_build_tag() -> Result<()> { // Populate the `--find-links` entries. fs_err::create_dir_all(context.temp_dir.join("links"))?; - for entry in fs_err::read_dir(context.workspace_root.join("scripts/links"))? { + for entry in fs_err::read_dir(context.workspace_root.join("test/links"))? { let entry = entry?; let path = entry.path(); if path @@ -10538,7 +10538,7 @@ fn find_links_relative_in_config_works_from_subdir() -> Result<()> { let wheel_src = context .workspace_root - .join("scripts/links/ok-1.0.0-py3-none-any.whl"); + .join("test/links/ok-1.0.0-py3-none-any.whl"); let wheel_dst = packages.child("ok-1.0.0-py3-none-any.whl"); fs_err::copy(&wheel_src, &wheel_dst)?; diff --git a/crates/uv/tests/it/tool_install.rs b/crates/uv/tests/it/tool_install.rs index 2e4d068ce..18a1a7a0a 100644 --- a/crates/uv/tests/it/tool_install.rs +++ b/crates/uv/tests/it/tool_install.rs @@ -295,7 +295,7 @@ fn tool_install_with_editable() -> Result<()> { let bin_dir = context.temp_dir.child("bin"); let anyio_local = context.temp_dir.child("src").child("anyio_local"); copy_dir_all( - context.workspace_root.join("scripts/packages/anyio_local"), + context.workspace_root.join("test/packages/anyio_local"), &anyio_local, )?; @@ -597,7 +597,7 @@ fn tool_install_editable() { // Install `black` as an editable package. uv_snapshot!(context.filters(), context.tool_install() .arg("-e") - .arg(context.workspace_root.join("scripts/packages/black_editable")) + .arg(context.workspace_root.join("test/packages/black_editable")) .env(EnvVars::UV_TOOL_DIR, tool_dir.as_os_str()) .env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str()) .env(EnvVars::PATH, bin_dir.as_os_str()), @r###" @@ -609,7 +609,7 @@ fn tool_install_editable() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) Installed 1 executable: black "###); @@ -649,7 +649,7 @@ fn tool_install_editable() { // We should have a tool receipt assert_snapshot!(fs_err::read_to_string(tool_dir.join("black").join("uv-receipt.toml")).unwrap(), @r###" [tool] - requirements = [{ name = "black", editable = "[WORKSPACE]/scripts/packages/black_editable" }] + requirements = [{ name = "black", editable = "[WORKSPACE]/test/packages/black_editable" }] entrypoints = [ { name = "black", install-path = "[TEMP_DIR]/bin/black", from = "black" }, ] @@ -717,7 +717,7 @@ fn tool_install_editable() { Prepared 6 packages in [TIME] Uninstalled 1 package in [TIME] Installed 6 packages in [TIME] - - black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + - black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) + black==24.2.0 + click==8.1.7 + mypy-extensions==1.0.0 @@ -898,7 +898,7 @@ fn tool_install_editable_from() { .arg("black") .arg("-e") .arg("--from") - .arg(context.workspace_root.join("scripts/packages/black_editable")) + .arg(context.workspace_root.join("test/packages/black_editable")) .env(EnvVars::UV_TOOL_DIR, tool_dir.as_os_str()) .env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str()) .env(EnvVars::PATH, bin_dir.as_os_str()), @r###" @@ -910,7 +910,7 @@ fn tool_install_editable_from() { Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] - + black==0.1.0 (from file://[WORKSPACE]/scripts/packages/black_editable) + + black==0.1.0 (from file://[WORKSPACE]/test/packages/black_editable) Installed 1 executable: black "###); @@ -950,7 +950,7 @@ fn tool_install_editable_from() { // We should have a tool receipt assert_snapshot!(fs_err::read_to_string(tool_dir.join("black").join("uv-receipt.toml")).unwrap(), @r###" [tool] - requirements = [{ name = "black", editable = "[WORKSPACE]/scripts/packages/black_editable" }] + requirements = [{ name = "black", editable = "[WORKSPACE]/test/packages/black_editable" }] entrypoints = [ { name = "black", install-path = "[TEMP_DIR]/bin/black", from = "black" }, ] @@ -4394,7 +4394,7 @@ fn tool_install_find_links() { // Run with `--find-links`. uv_snapshot!(context.filters(), context.tool_run() .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")) + .arg(context.workspace_root.join("test/links/")) .arg("basic-app") .env(EnvVars::UV_TOOL_DIR, tool_dir.as_os_str()) .env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str()), @r" @@ -4413,7 +4413,7 @@ fn tool_install_find_links() { // Install with `--find-links`. uv_snapshot!(context.filters(), context.tool_install() .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")) + .arg(context.workspace_root.join("test/links/")) .arg("basic-app") .env(EnvVars::UV_TOOL_DIR, tool_dir.as_os_str()) .env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str()) @@ -4464,7 +4464,7 @@ fn tool_install_find_links() { uv_snapshot!(context.filters(), context.tool_run() .arg("--offline") .arg("--find-links") - .arg(context.workspace_root.join("scripts/links/")) + .arg(context.workspace_root.join("test/links/")) .arg("basic-app") .env(EnvVars::UV_TOOL_DIR, tool_dir.as_os_str()) .env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str()), @r" diff --git a/crates/uv/tests/it/tool_run.rs b/crates/uv/tests/it/tool_run.rs index ce1d19326..98dff2b01 100644 --- a/crates/uv/tests/it/tool_run.rs +++ b/crates/uv/tests/it/tool_run.rs @@ -1381,15 +1381,13 @@ fn tool_run_csv_with_shorthand() -> anyhow::Result<()> { let anyio_local = context.temp_dir.child("src").child("anyio_local"); copy_dir_all( - context.workspace_root.join("scripts/packages/anyio_local"), + context.workspace_root.join("test/packages/anyio_local"), &anyio_local, )?; let black_editable = context.temp_dir.child("src").child("black_editable"); copy_dir_all( - context - .workspace_root - .join("scripts/packages/black_editable"), + context.workspace_root.join("test/packages/black_editable"), &black_editable, )?; @@ -1445,15 +1443,13 @@ fn tool_run_csv_with() -> anyhow::Result<()> { let anyio_local = context.temp_dir.child("src").child("anyio_local"); copy_dir_all( - context.workspace_root.join("scripts/packages/anyio_local"), + context.workspace_root.join("test/packages/anyio_local"), &anyio_local, )?; let black_editable = context.temp_dir.child("src").child("black_editable"); copy_dir_all( - context - .workspace_root - .join("scripts/packages/black_editable"), + context.workspace_root.join("test/packages/black_editable"), &black_editable, )?; @@ -1509,15 +1505,13 @@ fn tool_run_csv_with() -> anyhow::Result<()> { let anyio_local = context.temp_dir.child("src").child("anyio_local"); copy_dir_all( - context.workspace_root.join("scripts/packages/anyio_local"), + context.workspace_root.join("test/packages/anyio_local"), &anyio_local, )?; let black_editable = context.temp_dir.child("src").child("black_editable"); copy_dir_all( - context - .workspace_root - .join("scripts/packages/black_editable"), + context.workspace_root.join("test/packages/black_editable"), &black_editable, )?; @@ -1573,15 +1567,13 @@ fn tool_run_repeated_with() -> anyhow::Result<()> { let anyio_local = context.temp_dir.child("src").child("anyio_local"); copy_dir_all( - context.workspace_root.join("scripts/packages/anyio_local"), + context.workspace_root.join("test/packages/anyio_local"), &anyio_local, )?; let black_editable = context.temp_dir.child("src").child("black_editable"); copy_dir_all( - context - .workspace_root - .join("scripts/packages/black_editable"), + context.workspace_root.join("test/packages/black_editable"), &black_editable, )?; @@ -1639,15 +1631,13 @@ fn tool_run_repeated_with() -> anyhow::Result<()> { let anyio_local = context.temp_dir.child("src").child("anyio_local"); copy_dir_all( - context.workspace_root.join("scripts/packages/anyio_local"), + context.workspace_root.join("test/packages/anyio_local"), &anyio_local, )?; let black_editable = context.temp_dir.child("src").child("black_editable"); copy_dir_all( - context - .workspace_root - .join("scripts/packages/black_editable"), + context.workspace_root.join("test/packages/black_editable"), &black_editable, )?; @@ -1704,15 +1694,13 @@ fn tool_run_with_editable() -> anyhow::Result<()> { let anyio_local = context.temp_dir.child("src").child("anyio_local"); copy_dir_all( - context.workspace_root.join("scripts/packages/anyio_local"), + context.workspace_root.join("test/packages/anyio_local"), &anyio_local, )?; let black_editable = context.temp_dir.child("src").child("black_editable"); copy_dir_all( - context - .workspace_root - .join("scripts/packages/black_editable"), + context.workspace_root.join("test/packages/black_editable"), &black_editable, )?; @@ -3419,7 +3407,7 @@ fn tool_run_windows_dotted_package_name() -> anyhow::Result<()> { let bin_dir = context.temp_dir.child("bin"); // Copy the test package to a temporary location - let workspace_packages = context.workspace_root.join("scripts").join("packages"); + let workspace_packages = context.workspace_root.join("test").join("packages"); let test_package_source = workspace_packages.join("package.name.with.dots"); let test_package_dest = context.temp_dir.child("package.name.with.dots"); diff --git a/crates/uv/tests/it/workspace.rs b/crates/uv/tests/it/workspace.rs index f9f16e6f6..aee68d125 100644 --- a/crates/uv/tests/it/workspace.rs +++ b/crates/uv/tests/it/workspace.rs @@ -19,7 +19,7 @@ fn workspaces_dir() -> PathBuf { .unwrap() .parent() .unwrap() - .join("scripts") + .join("test") .join("workspaces") } diff --git a/crates/uv/tests/it/workspace_dir.rs b/crates/uv/tests/it/workspace_dir.rs index c345b0c6b..424581a82 100644 --- a/crates/uv/tests/it/workspace_dir.rs +++ b/crates/uv/tests/it/workspace_dir.rs @@ -69,7 +69,7 @@ fn workspace_metadata_from_member() -> Result<()> { let albatross_workspace = context .workspace_root - .join("scripts/workspaces/albatross-root-workspace"); + .join("test/workspaces/albatross-root-workspace"); copy_dir_ignore(albatross_workspace, &workspace)?; diff --git a/crates/uv/tests/it/workspace_list.rs b/crates/uv/tests/it/workspace_list.rs index 5716c286d..96c88ea82 100644 --- a/crates/uv/tests/it/workspace_list.rs +++ b/crates/uv/tests/it/workspace_list.rs @@ -46,7 +46,7 @@ fn workspace_list_root_workspace() -> Result<()> { copy_dir_ignore( context .workspace_root - .join("scripts/workspaces/albatross-root-workspace"), + .join("test/workspaces/albatross-root-workspace"), &workspace, )?; @@ -75,7 +75,7 @@ fn workspace_list_virtual_workspace() -> Result<()> { copy_dir_ignore( context .workspace_root - .join("scripts/workspaces/albatross-virtual-workspace"), + .join("test/workspaces/albatross-virtual-workspace"), &workspace, )?; @@ -104,7 +104,7 @@ fn workspace_list_from_member() -> Result<()> { copy_dir_ignore( context .workspace_root - .join("scripts/workspaces/albatross-root-workspace"), + .join("test/workspaces/albatross-root-workspace"), &workspace, )?; @@ -208,7 +208,7 @@ fn workspace_list_with_excluded() -> Result<()> { copy_dir_ignore( context .workspace_root - .join("scripts/workspaces/albatross-project-in-excluded"), + .join("test/workspaces/albatross-project-in-excluded"), &workspace, )?; diff --git a/crates/uv/tests/it/workspace_metadata.rs b/crates/uv/tests/it/workspace_metadata.rs index 536a54d45..250ca9b68 100644 --- a/crates/uv/tests/it/workspace_metadata.rs +++ b/crates/uv/tests/it/workspace_metadata.rs @@ -46,7 +46,7 @@ fn workspace_metadata_root_workspace() -> Result<()> { copy_dir_ignore( context .workspace_root - .join("scripts/workspaces/albatross-root-workspace"), + .join("test/workspaces/albatross-root-workspace"), &workspace, )?; @@ -92,7 +92,7 @@ fn workspace_metadata_virtual_workspace() -> Result<()> { copy_dir_ignore( context .workspace_root - .join("scripts/workspaces/albatross-virtual-workspace"), + .join("test/workspaces/albatross-virtual-workspace"), &workspace, )?; @@ -138,7 +138,7 @@ fn workspace_metadata_from_member() -> Result<()> { copy_dir_ignore( context .workspace_root - .join("scripts/workspaces/albatross-root-workspace"), + .join("test/workspaces/albatross-root-workspace"), &workspace, )?; @@ -274,7 +274,7 @@ fn workspace_metadata_with_excluded() -> Result<()> { copy_dir_ignore( context .workspace_root - .join("scripts/workspaces/albatross-project-in-excluded"), + .join("test/workspaces/albatross-project-in-excluded"), &workspace, )?; diff --git a/ruff.toml b/ruff.toml index 7c6488a1e..1e255aa27 100644 --- a/ruff.toml +++ b/ruff.toml @@ -2,9 +2,9 @@ target-version = "py312" exclude = [ "crates/uv-virtualenv/src/activator/activate_this.py", "crates/uv-virtualenv/src/_virtualenv.py", - "ecosystem", - "scripts/workspaces", - "scripts/packages", + "test/ecosystem", + "test/workspaces", + "test/packages", ] [lint] diff --git a/ecosystem/.gitignore b/test/ecosystem/.gitignore similarity index 100% rename from ecosystem/.gitignore rename to test/ecosystem/.gitignore diff --git a/ecosystem/airflow/LICENSE b/test/ecosystem/airflow/LICENSE similarity index 100% rename from ecosystem/airflow/LICENSE rename to test/ecosystem/airflow/LICENSE diff --git a/ecosystem/airflow/NOTICE b/test/ecosystem/airflow/NOTICE similarity index 100% rename from ecosystem/airflow/NOTICE rename to test/ecosystem/airflow/NOTICE diff --git a/ecosystem/airflow/pyproject.toml b/test/ecosystem/airflow/pyproject.toml similarity index 100% rename from ecosystem/airflow/pyproject.toml rename to test/ecosystem/airflow/pyproject.toml diff --git a/ecosystem/black/LICENSE b/test/ecosystem/black/LICENSE similarity index 100% rename from ecosystem/black/LICENSE rename to test/ecosystem/black/LICENSE diff --git a/ecosystem/black/PKG-INFO b/test/ecosystem/black/PKG-INFO similarity index 100% rename from ecosystem/black/PKG-INFO rename to test/ecosystem/black/PKG-INFO diff --git a/ecosystem/black/pyproject.toml b/test/ecosystem/black/pyproject.toml similarity index 100% rename from ecosystem/black/pyproject.toml rename to test/ecosystem/black/pyproject.toml diff --git a/ecosystem/github-wikidata-bot/License b/test/ecosystem/github-wikidata-bot/License similarity index 100% rename from ecosystem/github-wikidata-bot/License rename to test/ecosystem/github-wikidata-bot/License diff --git a/ecosystem/github-wikidata-bot/pyproject.toml b/test/ecosystem/github-wikidata-bot/pyproject.toml similarity index 100% rename from ecosystem/github-wikidata-bot/pyproject.toml rename to test/ecosystem/github-wikidata-bot/pyproject.toml diff --git a/ecosystem/home-assistant-core/LICENSE.md b/test/ecosystem/home-assistant-core/LICENSE.md similarity index 100% rename from ecosystem/home-assistant-core/LICENSE.md rename to test/ecosystem/home-assistant-core/LICENSE.md diff --git a/ecosystem/home-assistant-core/pyproject.toml b/test/ecosystem/home-assistant-core/pyproject.toml similarity index 100% rename from ecosystem/home-assistant-core/pyproject.toml rename to test/ecosystem/home-assistant-core/pyproject.toml diff --git a/ecosystem/packse/LICENSE-APACHE b/test/ecosystem/packse/LICENSE-APACHE similarity index 100% rename from ecosystem/packse/LICENSE-APACHE rename to test/ecosystem/packse/LICENSE-APACHE diff --git a/ecosystem/packse/LICENSE-MIT b/test/ecosystem/packse/LICENSE-MIT similarity index 100% rename from ecosystem/packse/LICENSE-MIT rename to test/ecosystem/packse/LICENSE-MIT diff --git a/ecosystem/packse/pyproject.toml b/test/ecosystem/packse/pyproject.toml similarity index 100% rename from ecosystem/packse/pyproject.toml rename to test/ecosystem/packse/pyproject.toml diff --git a/ecosystem/saleor/LICENSE b/test/ecosystem/saleor/LICENSE similarity index 100% rename from ecosystem/saleor/LICENSE rename to test/ecosystem/saleor/LICENSE diff --git a/ecosystem/saleor/pyproject.toml b/test/ecosystem/saleor/pyproject.toml similarity index 100% rename from ecosystem/saleor/pyproject.toml rename to test/ecosystem/saleor/pyproject.toml diff --git a/ecosystem/transformers/LICENSE b/test/ecosystem/transformers/LICENSE similarity index 100% rename from ecosystem/transformers/LICENSE rename to test/ecosystem/transformers/LICENSE diff --git a/ecosystem/transformers/pyproject.toml b/test/ecosystem/transformers/pyproject.toml similarity index 100% rename from ecosystem/transformers/pyproject.toml rename to test/ecosystem/transformers/pyproject.toml diff --git a/ecosystem/warehouse/LICENSE b/test/ecosystem/warehouse/LICENSE similarity index 100% rename from ecosystem/warehouse/LICENSE rename to test/ecosystem/warehouse/LICENSE diff --git a/ecosystem/warehouse/pyproject.toml b/test/ecosystem/warehouse/pyproject.toml similarity index 100% rename from ecosystem/warehouse/pyproject.toml rename to test/ecosystem/warehouse/pyproject.toml diff --git a/scripts/links/basic_app-0.1.0-py3-none-any.whl b/test/links/basic_app-0.1.0-py3-none-any.whl similarity index 100% rename from scripts/links/basic_app-0.1.0-py3-none-any.whl rename to test/links/basic_app-0.1.0-py3-none-any.whl diff --git a/scripts/links/basic_package-0.1.0-py3-none-any.whl b/test/links/basic_package-0.1.0-py3-none-any.whl similarity index 100% rename from scripts/links/basic_package-0.1.0-py3-none-any.whl rename to test/links/basic_package-0.1.0-py3-none-any.whl diff --git a/scripts/links/basic_package-0.1.0.tar.gz b/test/links/basic_package-0.1.0.tar.gz similarity index 100% rename from scripts/links/basic_package-0.1.0.tar.gz rename to test/links/basic_package-0.1.0.tar.gz diff --git a/scripts/links/build_tag-1.0.0-1-py2.py3-none-any.whl b/test/links/build_tag-1.0.0-1-py2.py3-none-any.whl similarity index 100% rename from scripts/links/build_tag-1.0.0-1-py2.py3-none-any.whl rename to test/links/build_tag-1.0.0-1-py2.py3-none-any.whl diff --git a/scripts/links/build_tag-1.0.0-3-py2.py3-none-any.whl b/test/links/build_tag-1.0.0-3-py2.py3-none-any.whl similarity index 100% rename from scripts/links/build_tag-1.0.0-3-py2.py3-none-any.whl rename to test/links/build_tag-1.0.0-3-py2.py3-none-any.whl diff --git a/scripts/links/build_tag-1.0.0-5-py2.py3-none-any.whl b/test/links/build_tag-1.0.0-5-py2.py3-none-any.whl similarity index 100% rename from scripts/links/build_tag-1.0.0-5-py2.py3-none-any.whl rename to test/links/build_tag-1.0.0-5-py2.py3-none-any.whl diff --git a/scripts/links/bz2-1.0.0.tar.bz2 b/test/links/bz2-1.0.0.tar.bz2 similarity index 100% rename from scripts/links/bz2-1.0.0.tar.bz2 rename to test/links/bz2-1.0.0.tar.bz2 diff --git a/scripts/links/extras-0.0.1.tar.gz b/test/links/extras-0.0.1.tar.gz similarity index 100% rename from scripts/links/extras-0.0.1.tar.gz rename to test/links/extras-0.0.1.tar.gz diff --git a/scripts/links/extras-0.0.2.tar.gz b/test/links/extras-0.0.2.tar.gz similarity index 100% rename from scripts/links/extras-0.0.2.tar.gz rename to test/links/extras-0.0.2.tar.gz diff --git a/scripts/links/maturin-1.4.0-py3-none-any.whl b/test/links/maturin-1.4.0-py3-none-any.whl similarity index 100% rename from scripts/links/maturin-1.4.0-py3-none-any.whl rename to test/links/maturin-1.4.0-py3-none-any.whl diff --git a/scripts/links/maturin-2.0.0-py3-none-linux_x86_64.whl b/test/links/maturin-2.0.0-py3-none-linux_x86_64.whl similarity index 100% rename from scripts/links/maturin-2.0.0-py3-none-linux_x86_64.whl rename to test/links/maturin-2.0.0-py3-none-linux_x86_64.whl diff --git a/scripts/links/ok-1.0.0-py3-none-any.whl b/test/links/ok-1.0.0-py3-none-any.whl similarity index 100% rename from scripts/links/ok-1.0.0-py3-none-any.whl rename to test/links/ok-1.0.0-py3-none-any.whl diff --git a/scripts/links/ok-2.0.0-py3-none-any.whl b/test/links/ok-2.0.0-py3-none-any.whl similarity index 100% rename from scripts/links/ok-2.0.0-py3-none-any.whl rename to test/links/ok-2.0.0-py3-none-any.whl diff --git a/scripts/links/simple_launcher-0.1.0-py3-none-any.whl b/test/links/simple_launcher-0.1.0-py3-none-any.whl similarity index 100% rename from scripts/links/simple_launcher-0.1.0-py3-none-any.whl rename to test/links/simple_launcher-0.1.0-py3-none-any.whl diff --git a/scripts/links/tqdm-1000.0.0-py3-none-any.whl b/test/links/tqdm-1000.0.0-py3-none-any.whl similarity index 100% rename from scripts/links/tqdm-1000.0.0-py3-none-any.whl rename to test/links/tqdm-1000.0.0-py3-none-any.whl diff --git a/scripts/links/tqdm-4.66.1-py3-none-manylinux_2_12_x86_64.manylinux2010_x86_64.musllinux_1_1_x86_64.whl b/test/links/tqdm-4.66.1-py3-none-manylinux_2_12_x86_64.manylinux2010_x86_64.musllinux_1_1_x86_64.whl similarity index 100% rename from scripts/links/tqdm-4.66.1-py3-none-manylinux_2_12_x86_64.manylinux2010_x86_64.musllinux_1_1_x86_64.whl rename to test/links/tqdm-4.66.1-py3-none-manylinux_2_12_x86_64.manylinux2010_x86_64.musllinux_1_1_x86_64.whl diff --git a/scripts/links/tqdm-999.0.0.tar.gz b/test/links/tqdm-999.0.0.tar.gz similarity index 100% rename from scripts/links/tqdm-999.0.0.tar.gz rename to test/links/tqdm-999.0.0.tar.gz diff --git a/scripts/links/validation-1.0.0-py3-none-any.whl b/test/links/validation-1.0.0-py3-none-any.whl similarity index 100% rename from scripts/links/validation-1.0.0-py3-none-any.whl rename to test/links/validation-1.0.0-py3-none-any.whl diff --git a/scripts/links/validation-2.0.0-py3-none-any.whl b/test/links/validation-2.0.0-py3-none-any.whl similarity index 100% rename from scripts/links/validation-2.0.0-py3-none-any.whl rename to test/links/validation-2.0.0-py3-none-any.whl diff --git a/scripts/links/validation-3.0.0-py3-none-any.whl b/test/links/validation-3.0.0-py3-none-any.whl similarity index 100% rename from scripts/links/validation-3.0.0-py3-none-any.whl rename to test/links/validation-3.0.0-py3-none-any.whl diff --git a/scripts/links/wheel_tag_test-0.1.0-py3-none-win_amd64.whl b/test/links/wheel_tag_test-0.1.0-py3-none-win_amd64.whl similarity index 100% rename from scripts/links/wheel_tag_test-0.1.0-py3-none-win_amd64.whl rename to test/links/wheel_tag_test-0.1.0-py3-none-win_amd64.whl diff --git a/scripts/packages/README.md b/test/packages/README.md similarity index 100% rename from scripts/packages/README.md rename to test/packages/README.md diff --git a/scripts/packages/anyio_local/.gitignore b/test/packages/anyio_local/.gitignore similarity index 100% rename from scripts/packages/anyio_local/.gitignore rename to test/packages/anyio_local/.gitignore diff --git a/scripts/packages/anyio_local/.python-version b/test/packages/anyio_local/.python-version similarity index 100% rename from scripts/packages/anyio_local/.python-version rename to test/packages/anyio_local/.python-version diff --git a/scripts/packages/anyio_local/anyio/__init__.py b/test/packages/anyio_local/anyio/__init__.py similarity index 100% rename from scripts/packages/anyio_local/anyio/__init__.py rename to test/packages/anyio_local/anyio/__init__.py diff --git a/scripts/packages/anyio_local/pyproject.toml b/test/packages/anyio_local/pyproject.toml similarity index 100% rename from scripts/packages/anyio_local/pyproject.toml rename to test/packages/anyio_local/pyproject.toml diff --git a/scripts/packages/black_editable/.gitignore b/test/packages/black_editable/.gitignore similarity index 100% rename from scripts/packages/black_editable/.gitignore rename to test/packages/black_editable/.gitignore diff --git a/scripts/packages/black_editable/black/__init__.py b/test/packages/black_editable/black/__init__.py similarity index 100% rename from scripts/packages/black_editable/black/__init__.py rename to test/packages/black_editable/black/__init__.py diff --git a/scripts/packages/black_editable/pyproject.toml b/test/packages/black_editable/pyproject.toml similarity index 100% rename from scripts/packages/black_editable/pyproject.toml rename to test/packages/black_editable/pyproject.toml diff --git a/scripts/packages/built-by-uv/.gitignore b/test/packages/built-by-uv/.gitignore similarity index 100% rename from scripts/packages/built-by-uv/.gitignore rename to test/packages/built-by-uv/.gitignore diff --git a/scripts/packages/built-by-uv/.python-version b/test/packages/built-by-uv/.python-version similarity index 100% rename from scripts/packages/built-by-uv/.python-version rename to test/packages/built-by-uv/.python-version diff --git a/scripts/packages/built-by-uv/LICENSE-APACHE b/test/packages/built-by-uv/LICENSE-APACHE similarity index 100% rename from scripts/packages/built-by-uv/LICENSE-APACHE rename to test/packages/built-by-uv/LICENSE-APACHE diff --git a/scripts/packages/built-by-uv/LICENSE-MIT b/test/packages/built-by-uv/LICENSE-MIT similarity index 100% rename from scripts/packages/built-by-uv/LICENSE-MIT rename to test/packages/built-by-uv/LICENSE-MIT diff --git a/scripts/packages/built-by-uv/README.md b/test/packages/built-by-uv/README.md similarity index 100% rename from scripts/packages/built-by-uv/README.md rename to test/packages/built-by-uv/README.md diff --git a/scripts/packages/built-by-uv/assets/data.csv b/test/packages/built-by-uv/assets/data.csv similarity index 100% rename from scripts/packages/built-by-uv/assets/data.csv rename to test/packages/built-by-uv/assets/data.csv diff --git a/scripts/packages/built-by-uv/data-dir/build-script.py b/test/packages/built-by-uv/data-dir/build-script.py similarity index 100% rename from scripts/packages/built-by-uv/data-dir/build-script.py rename to test/packages/built-by-uv/data-dir/build-script.py diff --git a/scripts/packages/built-by-uv/data-dir/dont-include-me.txt b/test/packages/built-by-uv/data-dir/dont-include-me.txt similarity index 100% rename from scripts/packages/built-by-uv/data-dir/dont-include-me.txt rename to test/packages/built-by-uv/data-dir/dont-include-me.txt diff --git a/scripts/packages/built-by-uv/header/built_by_uv.h b/test/packages/built-by-uv/header/built_by_uv.h similarity index 100% rename from scripts/packages/built-by-uv/header/built_by_uv.h rename to test/packages/built-by-uv/header/built_by_uv.h diff --git a/scripts/packages/built-by-uv/pyproject.toml b/test/packages/built-by-uv/pyproject.toml similarity index 100% rename from scripts/packages/built-by-uv/pyproject.toml rename to test/packages/built-by-uv/pyproject.toml diff --git a/scripts/packages/built-by-uv/scripts/whoami.sh b/test/packages/built-by-uv/scripts/whoami.sh similarity index 100% rename from scripts/packages/built-by-uv/scripts/whoami.sh rename to test/packages/built-by-uv/scripts/whoami.sh diff --git a/scripts/packages/built-by-uv/src/built_by_uv/__init__.py b/test/packages/built-by-uv/src/built_by_uv/__init__.py similarity index 100% rename from scripts/packages/built-by-uv/src/built_by_uv/__init__.py rename to test/packages/built-by-uv/src/built_by_uv/__init__.py diff --git a/scripts/packages/built-by-uv/src/built_by_uv/arithmetic/__init__.py b/test/packages/built-by-uv/src/built_by_uv/arithmetic/__init__.py similarity index 100% rename from scripts/packages/built-by-uv/src/built_by_uv/arithmetic/__init__.py rename to test/packages/built-by-uv/src/built_by_uv/arithmetic/__init__.py diff --git a/scripts/packages/built-by-uv/src/built_by_uv/arithmetic/circle.py b/test/packages/built-by-uv/src/built_by_uv/arithmetic/circle.py similarity index 100% rename from scripts/packages/built-by-uv/src/built_by_uv/arithmetic/circle.py rename to test/packages/built-by-uv/src/built_by_uv/arithmetic/circle.py diff --git a/scripts/packages/built-by-uv/src/built_by_uv/arithmetic/pi.txt b/test/packages/built-by-uv/src/built_by_uv/arithmetic/pi.txt similarity index 100% rename from scripts/packages/built-by-uv/src/built_by_uv/arithmetic/pi.txt rename to test/packages/built-by-uv/src/built_by_uv/arithmetic/pi.txt diff --git a/scripts/packages/built-by-uv/src/built_by_uv/build-only.h b/test/packages/built-by-uv/src/built_by_uv/build-only.h similarity index 100% rename from scripts/packages/built-by-uv/src/built_by_uv/build-only.h rename to test/packages/built-by-uv/src/built_by_uv/build-only.h diff --git a/scripts/packages/built-by-uv/src/built_by_uv/cli.py b/test/packages/built-by-uv/src/built_by_uv/cli.py similarity index 100% rename from scripts/packages/built-by-uv/src/built_by_uv/cli.py rename to test/packages/built-by-uv/src/built_by_uv/cli.py diff --git a/scripts/packages/built-by-uv/src/built_by_uv/not-packaged.txt b/test/packages/built-by-uv/src/built_by_uv/not-packaged.txt similarity index 100% rename from scripts/packages/built-by-uv/src/built_by_uv/not-packaged.txt rename to test/packages/built-by-uv/src/built_by_uv/not-packaged.txt diff --git a/scripts/packages/built-by-uv/test.sh b/test/packages/built-by-uv/test.sh similarity index 100% rename from scripts/packages/built-by-uv/test.sh rename to test/packages/built-by-uv/test.sh diff --git a/scripts/packages/built-by-uv/tests/test_package.py b/test/packages/built-by-uv/tests/test_package.py similarity index 100% rename from scripts/packages/built-by-uv/tests/test_package.py rename to test/packages/built-by-uv/tests/test_package.py diff --git a/scripts/packages/built-by-uv/third-party-licenses/PEP-401.txt b/test/packages/built-by-uv/third-party-licenses/PEP-401.txt similarity index 100% rename from scripts/packages/built-by-uv/third-party-licenses/PEP-401.txt rename to test/packages/built-by-uv/third-party-licenses/PEP-401.txt diff --git a/scripts/packages/built-by-uv/uv.lock b/test/packages/built-by-uv/uv.lock similarity index 100% rename from scripts/packages/built-by-uv/uv.lock rename to test/packages/built-by-uv/uv.lock diff --git a/scripts/packages/dependent_locals/first_local/.gitignore b/test/packages/dependent_locals/first_local/.gitignore similarity index 100% rename from scripts/packages/dependent_locals/first_local/.gitignore rename to test/packages/dependent_locals/first_local/.gitignore diff --git a/scripts/packages/dependent_locals/first_local/README.md b/test/packages/dependent_locals/first_local/README.md similarity index 100% rename from scripts/packages/dependent_locals/first_local/README.md rename to test/packages/dependent_locals/first_local/README.md diff --git a/scripts/packages/dependent_locals/first_local/first_local/__init__.py b/test/packages/dependent_locals/first_local/first_local/__init__.py similarity index 100% rename from scripts/packages/dependent_locals/first_local/first_local/__init__.py rename to test/packages/dependent_locals/first_local/first_local/__init__.py diff --git a/scripts/packages/dependent_locals/first_local/pyproject.toml b/test/packages/dependent_locals/first_local/pyproject.toml similarity index 100% rename from scripts/packages/dependent_locals/first_local/pyproject.toml rename to test/packages/dependent_locals/first_local/pyproject.toml diff --git a/scripts/packages/dependent_locals/second_local/.gitignore b/test/packages/dependent_locals/second_local/.gitignore similarity index 100% rename from scripts/packages/dependent_locals/second_local/.gitignore rename to test/packages/dependent_locals/second_local/.gitignore diff --git a/scripts/packages/dependent_locals/second_local/README.md b/test/packages/dependent_locals/second_local/README.md similarity index 100% rename from scripts/packages/dependent_locals/second_local/README.md rename to test/packages/dependent_locals/second_local/README.md diff --git a/scripts/packages/dependent_locals/second_local/pyproject.toml b/test/packages/dependent_locals/second_local/pyproject.toml similarity index 100% rename from scripts/packages/dependent_locals/second_local/pyproject.toml rename to test/packages/dependent_locals/second_local/pyproject.toml diff --git a/scripts/packages/dependent_locals/second_local/second_local/__init__.py b/test/packages/dependent_locals/second_local/second_local/__init__.py similarity index 100% rename from scripts/packages/dependent_locals/second_local/second_local/__init__.py rename to test/packages/dependent_locals/second_local/second_local/__init__.py diff --git a/scripts/packages/deptry_reproducer/.gitignore b/test/packages/deptry_reproducer/.gitignore similarity index 100% rename from scripts/packages/deptry_reproducer/.gitignore rename to test/packages/deptry_reproducer/.gitignore diff --git a/scripts/packages/deptry_reproducer/Cargo.lock b/test/packages/deptry_reproducer/Cargo.lock similarity index 100% rename from scripts/packages/deptry_reproducer/Cargo.lock rename to test/packages/deptry_reproducer/Cargo.lock diff --git a/scripts/packages/deptry_reproducer/Cargo.toml b/test/packages/deptry_reproducer/Cargo.toml similarity index 100% rename from scripts/packages/deptry_reproducer/Cargo.toml rename to test/packages/deptry_reproducer/Cargo.toml diff --git a/scripts/packages/deptry_reproducer/deptry_reproducer-0.1.0.tar.gz b/test/packages/deptry_reproducer/deptry_reproducer-0.1.0.tar.gz similarity index 100% rename from scripts/packages/deptry_reproducer/deptry_reproducer-0.1.0.tar.gz rename to test/packages/deptry_reproducer/deptry_reproducer-0.1.0.tar.gz diff --git a/scripts/packages/deptry_reproducer/pyproject.toml b/test/packages/deptry_reproducer/pyproject.toml similarity index 100% rename from scripts/packages/deptry_reproducer/pyproject.toml rename to test/packages/deptry_reproducer/pyproject.toml diff --git a/scripts/packages/deptry_reproducer/python/deptry_reproducer/__init__.py b/test/packages/deptry_reproducer/python/deptry_reproducer/__init__.py similarity index 100% rename from scripts/packages/deptry_reproducer/python/deptry_reproducer/__init__.py rename to test/packages/deptry_reproducer/python/deptry_reproducer/__init__.py diff --git a/scripts/packages/deptry_reproducer/python/deptry_reproducer/foo.py b/test/packages/deptry_reproducer/python/deptry_reproducer/foo.py similarity index 100% rename from scripts/packages/deptry_reproducer/python/deptry_reproducer/foo.py rename to test/packages/deptry_reproducer/python/deptry_reproducer/foo.py diff --git a/scripts/packages/deptry_reproducer/src/lib.rs b/test/packages/deptry_reproducer/src/lib.rs similarity index 100% rename from scripts/packages/deptry_reproducer/src/lib.rs rename to test/packages/deptry_reproducer/src/lib.rs diff --git a/scripts/packages/fake-uv/README.md b/test/packages/fake-uv/README.md similarity index 100% rename from scripts/packages/fake-uv/README.md rename to test/packages/fake-uv/README.md diff --git a/scripts/packages/fake-uv/pyproject.toml b/test/packages/fake-uv/pyproject.toml similarity index 100% rename from scripts/packages/fake-uv/pyproject.toml rename to test/packages/fake-uv/pyproject.toml diff --git a/scripts/packages/fake-uv/scripts/uv b/test/packages/fake-uv/scripts/uv similarity index 100% rename from scripts/packages/fake-uv/scripts/uv rename to test/packages/fake-uv/scripts/uv diff --git a/scripts/packages/fake-uv/scripts/uv.exe b/test/packages/fake-uv/scripts/uv.exe similarity index 100% rename from scripts/packages/fake-uv/scripts/uv.exe rename to test/packages/fake-uv/scripts/uv.exe diff --git a/scripts/packages/fake-uv/src b/test/packages/fake-uv/src similarity index 100% rename from scripts/packages/fake-uv/src rename to test/packages/fake-uv/src diff --git a/scripts/packages/flit_editable/.gitignore b/test/packages/flit_editable/.gitignore similarity index 100% rename from scripts/packages/flit_editable/.gitignore rename to test/packages/flit_editable/.gitignore diff --git a/scripts/packages/flit_editable/flit_editable/__init__.py b/test/packages/flit_editable/flit_editable/__init__.py similarity index 100% rename from scripts/packages/flit_editable/flit_editable/__init__.py rename to test/packages/flit_editable/flit_editable/__init__.py diff --git a/scripts/packages/flit_editable/pyproject.toml b/test/packages/flit_editable/pyproject.toml similarity index 100% rename from scripts/packages/flit_editable/pyproject.toml rename to test/packages/flit_editable/pyproject.toml diff --git a/scripts/packages/hatchling_dynamic/hatch_build.py b/test/packages/hatchling_dynamic/hatch_build.py similarity index 100% rename from scripts/packages/hatchling_dynamic/hatch_build.py rename to test/packages/hatchling_dynamic/hatch_build.py diff --git a/scripts/packages/hatchling_dynamic/hatchling_dynamic/__init__.py b/test/packages/hatchling_dynamic/hatchling_dynamic/__init__.py similarity index 100% rename from scripts/packages/hatchling_dynamic/hatchling_dynamic/__init__.py rename to test/packages/hatchling_dynamic/hatchling_dynamic/__init__.py diff --git a/scripts/packages/hatchling_dynamic/pyproject.toml b/test/packages/hatchling_dynamic/pyproject.toml similarity index 100% rename from scripts/packages/hatchling_dynamic/pyproject.toml rename to test/packages/hatchling_dynamic/pyproject.toml diff --git a/scripts/packages/hatchling_editable/README.md b/test/packages/hatchling_editable/README.md similarity index 100% rename from scripts/packages/hatchling_editable/README.md rename to test/packages/hatchling_editable/README.md diff --git a/scripts/packages/hatchling_editable/hatchling_editable/__init__.py b/test/packages/hatchling_editable/hatchling_editable/__init__.py similarity index 100% rename from scripts/packages/hatchling_editable/hatchling_editable/__init__.py rename to test/packages/hatchling_editable/hatchling_editable/__init__.py diff --git a/scripts/packages/hatchling_editable/logging/__init__.py b/test/packages/hatchling_editable/logging/__init__.py similarity index 100% rename from scripts/packages/hatchling_editable/logging/__init__.py rename to test/packages/hatchling_editable/logging/__init__.py diff --git a/scripts/packages/hatchling_editable/pyproject.toml b/test/packages/hatchling_editable/pyproject.toml similarity index 100% rename from scripts/packages/hatchling_editable/pyproject.toml rename to test/packages/hatchling_editable/pyproject.toml diff --git a/scripts/packages/keyring_test_plugin/keyrings/__init__.py b/test/packages/keyring_test_plugin/keyrings/__init__.py similarity index 100% rename from scripts/packages/keyring_test_plugin/keyrings/__init__.py rename to test/packages/keyring_test_plugin/keyrings/__init__.py diff --git a/scripts/packages/keyring_test_plugin/keyrings/test_keyring.py b/test/packages/keyring_test_plugin/keyrings/test_keyring.py similarity index 100% rename from scripts/packages/keyring_test_plugin/keyrings/test_keyring.py rename to test/packages/keyring_test_plugin/keyrings/test_keyring.py diff --git a/scripts/packages/keyring_test_plugin/pyproject.toml b/test/packages/keyring_test_plugin/pyproject.toml similarity index 100% rename from scripts/packages/keyring_test_plugin/pyproject.toml rename to test/packages/keyring_test_plugin/pyproject.toml diff --git a/scripts/packages/package.name.with.dots/README.md b/test/packages/package.name.with.dots/README.md similarity index 100% rename from scripts/packages/package.name.with.dots/README.md rename to test/packages/package.name.with.dots/README.md diff --git a/scripts/packages/package.name.with.dots/pyproject.toml b/test/packages/package.name.with.dots/pyproject.toml similarity index 100% rename from scripts/packages/package.name.with.dots/pyproject.toml rename to test/packages/package.name.with.dots/pyproject.toml diff --git a/scripts/packages/package.name.with.dots/scripts/package.name.with.dots.ps1 b/test/packages/package.name.with.dots/scripts/package.name.with.dots.ps1 similarity index 100% rename from scripts/packages/package.name.with.dots/scripts/package.name.with.dots.ps1 rename to test/packages/package.name.with.dots/scripts/package.name.with.dots.ps1 diff --git a/scripts/packages/package.name.with.dots/src/package_name_with_dots/__init__.py b/test/packages/package.name.with.dots/src/package_name_with_dots/__init__.py similarity index 100% rename from scripts/packages/package.name.with.dots/src/package_name_with_dots/__init__.py rename to test/packages/package.name.with.dots/src/package_name_with_dots/__init__.py diff --git a/scripts/packages/poetry_editable/poetry_editable/__init__.py b/test/packages/poetry_editable/poetry_editable/__init__.py similarity index 100% rename from scripts/packages/poetry_editable/poetry_editable/__init__.py rename to test/packages/poetry_editable/poetry_editable/__init__.py diff --git a/scripts/packages/poetry_editable/pyproject.toml b/test/packages/poetry_editable/pyproject.toml similarity index 100% rename from scripts/packages/poetry_editable/pyproject.toml rename to test/packages/poetry_editable/pyproject.toml diff --git a/scripts/packages/root_editable/README.md b/test/packages/root_editable/README.md similarity index 100% rename from scripts/packages/root_editable/README.md rename to test/packages/root_editable/README.md diff --git a/scripts/packages/root_editable/pyproject.toml b/test/packages/root_editable/pyproject.toml similarity index 100% rename from scripts/packages/root_editable/pyproject.toml rename to test/packages/root_editable/pyproject.toml diff --git a/scripts/packages/root_editable/root_editable/__init__.py b/test/packages/root_editable/root_editable/__init__.py similarity index 100% rename from scripts/packages/root_editable/root_editable/__init__.py rename to test/packages/root_editable/root_editable/__init__.py diff --git a/scripts/packages/setup_cfg_editable/.gitignore b/test/packages/setup_cfg_editable/.gitignore similarity index 100% rename from scripts/packages/setup_cfg_editable/.gitignore rename to test/packages/setup_cfg_editable/.gitignore diff --git a/scripts/packages/setup_cfg_editable/setup.cfg b/test/packages/setup_cfg_editable/setup.cfg similarity index 100% rename from scripts/packages/setup_cfg_editable/setup.cfg rename to test/packages/setup_cfg_editable/setup.cfg diff --git a/scripts/packages/setup_cfg_editable/setup.py b/test/packages/setup_cfg_editable/setup.py similarity index 100% rename from scripts/packages/setup_cfg_editable/setup.py rename to test/packages/setup_cfg_editable/setup.py diff --git a/scripts/packages/setup_cfg_editable/setup_cfg_editable/__init__.py b/test/packages/setup_cfg_editable/setup_cfg_editable/__init__.py similarity index 100% rename from scripts/packages/setup_cfg_editable/setup_cfg_editable/__init__.py rename to test/packages/setup_cfg_editable/setup_cfg_editable/__init__.py diff --git a/scripts/packages/setup_py_editable/.gitignore b/test/packages/setup_py_editable/.gitignore similarity index 100% rename from scripts/packages/setup_py_editable/.gitignore rename to test/packages/setup_py_editable/.gitignore diff --git a/scripts/packages/setup_py_editable/setup.py b/test/packages/setup_py_editable/setup.py similarity index 100% rename from scripts/packages/setup_py_editable/setup.py rename to test/packages/setup_py_editable/setup.py diff --git a/scripts/packages/setup_py_editable/setup_py_editable/__init__.py b/test/packages/setup_py_editable/setup_py_editable/__init__.py similarity index 100% rename from scripts/packages/setup_py_editable/setup_py_editable/__init__.py rename to test/packages/setup_py_editable/setup_py_editable/__init__.py diff --git a/scripts/packages/setuptools_editable/.gitignore b/test/packages/setuptools_editable/.gitignore similarity index 100% rename from scripts/packages/setuptools_editable/.gitignore rename to test/packages/setuptools_editable/.gitignore diff --git a/scripts/packages/setuptools_editable/pyproject.toml b/test/packages/setuptools_editable/pyproject.toml similarity index 100% rename from scripts/packages/setuptools_editable/pyproject.toml rename to test/packages/setuptools_editable/pyproject.toml diff --git a/scripts/packages/setuptools_editable/setuptools_editable/__init__.py b/test/packages/setuptools_editable/setuptools_editable/__init__.py similarity index 100% rename from scripts/packages/setuptools_editable/setuptools_editable/__init__.py rename to test/packages/setuptools_editable/setuptools_editable/__init__.py diff --git a/scripts/requirements/.gitignore b/test/requirements/.gitignore similarity index 100% rename from scripts/requirements/.gitignore rename to test/requirements/.gitignore diff --git a/scripts/requirements/airflow.in b/test/requirements/airflow.in similarity index 100% rename from scripts/requirements/airflow.in rename to test/requirements/airflow.in diff --git a/scripts/requirements/airflow2-constraints.txt b/test/requirements/airflow2-constraints.txt similarity index 100% rename from scripts/requirements/airflow2-constraints.txt rename to test/requirements/airflow2-constraints.txt diff --git a/scripts/requirements/airflow2-req.in b/test/requirements/airflow2-req.in similarity index 59% rename from scripts/requirements/airflow2-req.in rename to test/requirements/airflow2-req.in index 70ed2851a..e39388efb 100644 --- a/scripts/requirements/airflow2-req.in +++ b/test/requirements/airflow2-req.in @@ -1,6 +1,6 @@ # Run with: # ``` -# uv pip compile scripts/requirements/airflow2-req.in -c scripts/requirements/airflow2-constraints.txt --universal --python-version 3.8 +# uv pip compile test/requirements/airflow2-req.in -c test/requirements/airflow2-constraints.txt --universal --python-version 3.8 # ``` apache-airflow[amazon,async,google,google_auth,grpc,hashicorp,http,ldap,mysql,odbc,pandas,postgres,redis,sftp,slack,ssh,statsd,virtualenv]==2.3.4 alembic>=1.8.1 diff --git a/scripts/requirements/all-kinds.in b/test/requirements/all-kinds.in similarity index 100% rename from scripts/requirements/all-kinds.in rename to test/requirements/all-kinds.in diff --git a/scripts/requirements/backtracking/apache-beam-dill.in b/test/requirements/backtracking/apache-beam-dill.in similarity index 100% rename from scripts/requirements/backtracking/apache-beam-dill.in rename to test/requirements/backtracking/apache-beam-dill.in diff --git a/scripts/requirements/backtracking/numpy-numba.in b/test/requirements/backtracking/numpy-numba.in similarity index 100% rename from scripts/requirements/backtracking/numpy-numba.in rename to test/requirements/backtracking/numpy-numba.in diff --git a/scripts/requirements/backtracking/numpy-sparse.in b/test/requirements/backtracking/numpy-sparse.in similarity index 100% rename from scripts/requirements/backtracking/numpy-sparse.in rename to test/requirements/backtracking/numpy-sparse.in diff --git a/scripts/requirements/backtracking/sentry.in b/test/requirements/backtracking/sentry.in similarity index 100% rename from scripts/requirements/backtracking/sentry.in rename to test/requirements/backtracking/sentry.in diff --git a/scripts/requirements/backtracking/starlette-fastapi.in b/test/requirements/backtracking/starlette-fastapi.in similarity index 100% rename from scripts/requirements/backtracking/starlette-fastapi.in rename to test/requirements/backtracking/starlette-fastapi.in diff --git a/scripts/requirements/bio_embeddings.in b/test/requirements/bio_embeddings.in similarity index 100% rename from scripts/requirements/bio_embeddings.in rename to test/requirements/bio_embeddings.in diff --git a/scripts/requirements/black.in b/test/requirements/black.in similarity index 100% rename from scripts/requirements/black.in rename to test/requirements/black.in diff --git a/scripts/requirements/boto3.in b/test/requirements/boto3.in similarity index 100% rename from scripts/requirements/boto3.in rename to test/requirements/boto3.in diff --git a/scripts/requirements/compiled/all-kinds.txt b/test/requirements/compiled/all-kinds.txt similarity index 96% rename from scripts/requirements/compiled/all-kinds.txt rename to test/requirements/compiled/all-kinds.txt index b77fb8e76..ca27d2963 100644 --- a/scripts/requirements/compiled/all-kinds.txt +++ b/test/requirements/compiled/all-kinds.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile scripts/requirements/all-kinds.in +# uv pip compile test/requirements/all-kinds.in annotated-types==0.6.0 # via pydantic asgiref==3.7.2 diff --git a/scripts/requirements/compiled/black.txt b/test/requirements/compiled/black.txt similarity index 86% rename from scripts/requirements/compiled/black.txt rename to test/requirements/compiled/black.txt index 3203dfdc6..133e25f53 100644 --- a/scripts/requirements/compiled/black.txt +++ b/test/requirements/compiled/black.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile scripts/requirements/black.in +# uv pip compile test/requirements/black.in black==23.12.1 click==8.1.7 # via black diff --git a/scripts/requirements/compiled/boto3.txt b/test/requirements/compiled/boto3.txt similarity index 87% rename from scripts/requirements/compiled/boto3.txt rename to test/requirements/compiled/boto3.txt index 391de7de9..102042968 100644 --- a/scripts/requirements/compiled/boto3.txt +++ b/test/requirements/compiled/boto3.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile scripts/requirements/boto3.in +# uv pip compile test/requirements/boto3.in boto3==1.15.18 botocore==1.18.18 # via diff --git a/scripts/requirements/compiled/dtlssocket.txt b/test/requirements/compiled/dtlssocket.txt similarity index 68% rename from scripts/requirements/compiled/dtlssocket.txt rename to test/requirements/compiled/dtlssocket.txt index b996590d9..d9f14cf5b 100644 --- a/scripts/requirements/compiled/dtlssocket.txt +++ b/test/requirements/compiled/dtlssocket.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile scripts/requirements/dtlssocket.in +# uv pip compile test/requirements/dtlssocket.in cython==0.29.37 # via dtlssocket dtlssocket==0.1.16 diff --git a/scripts/requirements/compiled/flyte.txt b/test/requirements/compiled/flyte.txt similarity index 99% rename from scripts/requirements/compiled/flyte.txt rename to test/requirements/compiled/flyte.txt index fb253b9c1..4bbc76b9d 100644 --- a/scripts/requirements/compiled/flyte.txt +++ b/test/requirements/compiled/flyte.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile scripts/requirements/flyte.in +# uv pip compile test/requirements/flyte.in absl-py==2.0.0 # via # tensorboard diff --git a/scripts/requirements/compiled/jupyter.txt b/test/requirements/compiled/jupyter.txt similarity index 99% rename from scripts/requirements/compiled/jupyter.txt rename to test/requirements/compiled/jupyter.txt index 9d51ac3d7..2dfd440fe 100644 --- a/scripts/requirements/compiled/jupyter.txt +++ b/test/requirements/compiled/jupyter.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile scripts/requirements/jupyter.in +# uv pip compile test/requirements/jupyter.in anyio==4.2.0 # via jupyter-server argon2-cffi==23.1.0 diff --git a/scripts/requirements/compiled/pdm_2193.txt b/test/requirements/compiled/pdm_2193.txt similarity index 91% rename from scripts/requirements/compiled/pdm_2193.txt rename to test/requirements/compiled/pdm_2193.txt index f819c974f..53fdaf8a1 100644 --- a/scripts/requirements/compiled/pdm_2193.txt +++ b/test/requirements/compiled/pdm_2193.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile scripts/requirements/pdm_2193.in +# uv pip compile test/requirements/pdm_2193.in certifi==2023.11.17 # via requests charset-normalizer==3.3.2 diff --git a/scripts/requirements/compiled/scispacy.txt b/test/requirements/compiled/scispacy.txt similarity index 98% rename from scripts/requirements/compiled/scispacy.txt rename to test/requirements/compiled/scispacy.txt index 27caee2fb..d029e1c02 100644 --- a/scripts/requirements/compiled/scispacy.txt +++ b/test/requirements/compiled/scispacy.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile scripts/requirements/scispacy.in +# uv pip compile test/requirements/scispacy.in annotated-types==0.6.0 # via pydantic black==23.12.1 diff --git a/scripts/requirements/compiled/trio.txt b/test/requirements/compiled/trio.txt similarity index 97% rename from scripts/requirements/compiled/trio.txt rename to test/requirements/compiled/trio.txt index 166c595a4..31e083e76 100644 --- a/scripts/requirements/compiled/trio.txt +++ b/test/requirements/compiled/trio.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile scripts/requirements/trio.in +# uv pip compile test/requirements/trio.in alabaster==0.7.15 # via sphinx attrs==23.2.0 diff --git a/scripts/requirements/dtlssocket.in b/test/requirements/dtlssocket.in similarity index 100% rename from scripts/requirements/dtlssocket.in rename to test/requirements/dtlssocket.in diff --git a/scripts/requirements/flyte.in b/test/requirements/flyte.in similarity index 100% rename from scripts/requirements/flyte.in rename to test/requirements/flyte.in diff --git a/scripts/requirements/home-assistant.in b/test/requirements/home-assistant.in similarity index 100% rename from scripts/requirements/home-assistant.in rename to test/requirements/home-assistant.in diff --git a/scripts/requirements/jupyter.in b/test/requirements/jupyter.in similarity index 100% rename from scripts/requirements/jupyter.in rename to test/requirements/jupyter.in diff --git a/scripts/requirements/meine_stadt_transparent.in b/test/requirements/meine_stadt_transparent.in similarity index 100% rename from scripts/requirements/meine_stadt_transparent.in rename to test/requirements/meine_stadt_transparent.in diff --git a/scripts/requirements/pdm_2193.in b/test/requirements/pdm_2193.in similarity index 100% rename from scripts/requirements/pdm_2193.in rename to test/requirements/pdm_2193.in diff --git a/scripts/requirements/pydantic.in b/test/requirements/pydantic.in similarity index 100% rename from scripts/requirements/pydantic.in rename to test/requirements/pydantic.in diff --git a/scripts/requirements/scispacy.in b/test/requirements/scispacy.in similarity index 100% rename from scripts/requirements/scispacy.in rename to test/requirements/scispacy.in diff --git a/scripts/requirements/slow.in b/test/requirements/slow.in similarity index 100% rename from scripts/requirements/slow.in rename to test/requirements/slow.in diff --git a/scripts/requirements/transformers-extras.in b/test/requirements/transformers-extras.in similarity index 100% rename from scripts/requirements/transformers-extras.in rename to test/requirements/transformers-extras.in diff --git a/scripts/requirements/transformers/pyproject.toml b/test/requirements/transformers/pyproject.toml similarity index 100% rename from scripts/requirements/transformers/pyproject.toml rename to test/requirements/transformers/pyproject.toml diff --git a/scripts/requirements/trio.in b/test/requirements/trio.in similarity index 100% rename from scripts/requirements/trio.in rename to test/requirements/trio.in diff --git a/scripts/workspaces/.gitignore b/test/workspaces/.gitignore similarity index 100% rename from scripts/workspaces/.gitignore rename to test/workspaces/.gitignore diff --git a/scripts/workspaces/albatross-in-example/check_installed_albatross.py b/test/workspaces/albatross-in-example/check_installed_albatross.py similarity index 100% rename from scripts/workspaces/albatross-in-example/check_installed_albatross.py rename to test/workspaces/albatross-in-example/check_installed_albatross.py diff --git a/scripts/workspaces/albatross-in-example/examples/bird-feeder/check_installed_bird_feeder.py b/test/workspaces/albatross-in-example/examples/bird-feeder/check_installed_bird_feeder.py similarity index 100% rename from scripts/workspaces/albatross-in-example/examples/bird-feeder/check_installed_bird_feeder.py rename to test/workspaces/albatross-in-example/examples/bird-feeder/check_installed_bird_feeder.py diff --git a/scripts/workspaces/albatross-in-example/examples/bird-feeder/pyproject.toml b/test/workspaces/albatross-in-example/examples/bird-feeder/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-in-example/examples/bird-feeder/pyproject.toml rename to test/workspaces/albatross-in-example/examples/bird-feeder/pyproject.toml diff --git a/scripts/workspaces/albatross-in-example/examples/bird-feeder/src/bird_feeder/__init__.py b/test/workspaces/albatross-in-example/examples/bird-feeder/src/bird_feeder/__init__.py similarity index 100% rename from scripts/workspaces/albatross-in-example/examples/bird-feeder/src/bird_feeder/__init__.py rename to test/workspaces/albatross-in-example/examples/bird-feeder/src/bird_feeder/__init__.py diff --git a/scripts/workspaces/albatross-in-example/pyproject.toml b/test/workspaces/albatross-in-example/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-in-example/pyproject.toml rename to test/workspaces/albatross-in-example/pyproject.toml diff --git a/scripts/workspaces/albatross-in-example/src/albatross/__init__.py b/test/workspaces/albatross-in-example/src/albatross/__init__.py similarity index 100% rename from scripts/workspaces/albatross-in-example/src/albatross/__init__.py rename to test/workspaces/albatross-in-example/src/albatross/__init__.py diff --git a/scripts/workspaces/albatross-just-project/check_installed_albatross.py b/test/workspaces/albatross-just-project/check_installed_albatross.py similarity index 100% rename from scripts/workspaces/albatross-just-project/check_installed_albatross.py rename to test/workspaces/albatross-just-project/check_installed_albatross.py diff --git a/scripts/workspaces/albatross-just-project/pyproject.toml b/test/workspaces/albatross-just-project/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-just-project/pyproject.toml rename to test/workspaces/albatross-just-project/pyproject.toml diff --git a/scripts/workspaces/albatross-just-project/src/albatross/__init__.py b/test/workspaces/albatross-just-project/src/albatross/__init__.py similarity index 100% rename from scripts/workspaces/albatross-just-project/src/albatross/__init__.py rename to test/workspaces/albatross-just-project/src/albatross/__init__.py diff --git a/scripts/workspaces/albatross-project-in-excluded/excluded/bird-feeder/check_installed_bird_feeder.py b/test/workspaces/albatross-project-in-excluded/excluded/bird-feeder/check_installed_bird_feeder.py similarity index 100% rename from scripts/workspaces/albatross-project-in-excluded/excluded/bird-feeder/check_installed_bird_feeder.py rename to test/workspaces/albatross-project-in-excluded/excluded/bird-feeder/check_installed_bird_feeder.py diff --git a/scripts/workspaces/albatross-project-in-excluded/excluded/bird-feeder/pyproject.toml b/test/workspaces/albatross-project-in-excluded/excluded/bird-feeder/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-project-in-excluded/excluded/bird-feeder/pyproject.toml rename to test/workspaces/albatross-project-in-excluded/excluded/bird-feeder/pyproject.toml diff --git a/scripts/workspaces/albatross-project-in-excluded/excluded/bird-feeder/src/bird_feeder/__init__.py b/test/workspaces/albatross-project-in-excluded/excluded/bird-feeder/src/bird_feeder/__init__.py similarity index 100% rename from scripts/workspaces/albatross-project-in-excluded/excluded/bird-feeder/src/bird_feeder/__init__.py rename to test/workspaces/albatross-project-in-excluded/excluded/bird-feeder/src/bird_feeder/__init__.py diff --git a/scripts/workspaces/albatross-project-in-excluded/packages/seeds/pyproject.toml b/test/workspaces/albatross-project-in-excluded/packages/seeds/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-project-in-excluded/packages/seeds/pyproject.toml rename to test/workspaces/albatross-project-in-excluded/packages/seeds/pyproject.toml diff --git a/scripts/workspaces/albatross-project-in-excluded/packages/seeds/src/seeds/__init__.py b/test/workspaces/albatross-project-in-excluded/packages/seeds/src/seeds/__init__.py similarity index 100% rename from scripts/workspaces/albatross-project-in-excluded/packages/seeds/src/seeds/__init__.py rename to test/workspaces/albatross-project-in-excluded/packages/seeds/src/seeds/__init__.py diff --git a/scripts/workspaces/albatross-project-in-excluded/pyproject.toml b/test/workspaces/albatross-project-in-excluded/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-project-in-excluded/pyproject.toml rename to test/workspaces/albatross-project-in-excluded/pyproject.toml diff --git a/scripts/workspaces/albatross-project-in-excluded/src/albatross/__init__.py b/test/workspaces/albatross-project-in-excluded/src/albatross/__init__.py similarity index 100% rename from scripts/workspaces/albatross-project-in-excluded/src/albatross/__init__.py rename to test/workspaces/albatross-project-in-excluded/src/albatross/__init__.py diff --git a/scripts/workspaces/albatross-root-workspace/check_installed_albatross.py b/test/workspaces/albatross-root-workspace/check_installed_albatross.py similarity index 100% rename from scripts/workspaces/albatross-root-workspace/check_installed_albatross.py rename to test/workspaces/albatross-root-workspace/check_installed_albatross.py diff --git a/scripts/workspaces/albatross-root-workspace/packages/.gitignore b/test/workspaces/albatross-root-workspace/packages/.gitignore similarity index 100% rename from scripts/workspaces/albatross-root-workspace/packages/.gitignore rename to test/workspaces/albatross-root-workspace/packages/.gitignore diff --git a/scripts/workspaces/albatross-root-workspace/packages/bird-feeder/check_installed_bird_feeder.py b/test/workspaces/albatross-root-workspace/packages/bird-feeder/check_installed_bird_feeder.py similarity index 100% rename from scripts/workspaces/albatross-root-workspace/packages/bird-feeder/check_installed_bird_feeder.py rename to test/workspaces/albatross-root-workspace/packages/bird-feeder/check_installed_bird_feeder.py diff --git a/scripts/workspaces/albatross-root-workspace/packages/bird-feeder/pyproject.toml b/test/workspaces/albatross-root-workspace/packages/bird-feeder/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-root-workspace/packages/bird-feeder/pyproject.toml rename to test/workspaces/albatross-root-workspace/packages/bird-feeder/pyproject.toml diff --git a/scripts/workspaces/albatross-root-workspace/packages/bird-feeder/src/bird_feeder/__init__.py b/test/workspaces/albatross-root-workspace/packages/bird-feeder/src/bird_feeder/__init__.py similarity index 100% rename from scripts/workspaces/albatross-root-workspace/packages/bird-feeder/src/bird_feeder/__init__.py rename to test/workspaces/albatross-root-workspace/packages/bird-feeder/src/bird_feeder/__init__.py diff --git a/scripts/workspaces/albatross-root-workspace/packages/seeds/pyproject.toml b/test/workspaces/albatross-root-workspace/packages/seeds/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-root-workspace/packages/seeds/pyproject.toml rename to test/workspaces/albatross-root-workspace/packages/seeds/pyproject.toml diff --git a/scripts/workspaces/albatross-root-workspace/packages/seeds/src/seeds/__init__.py b/test/workspaces/albatross-root-workspace/packages/seeds/src/seeds/__init__.py similarity index 100% rename from scripts/workspaces/albatross-root-workspace/packages/seeds/src/seeds/__init__.py rename to test/workspaces/albatross-root-workspace/packages/seeds/src/seeds/__init__.py diff --git a/scripts/workspaces/albatross-root-workspace/pyproject.toml b/test/workspaces/albatross-root-workspace/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-root-workspace/pyproject.toml rename to test/workspaces/albatross-root-workspace/pyproject.toml diff --git a/scripts/workspaces/albatross-root-workspace/src/albatross/__init__.py b/test/workspaces/albatross-root-workspace/src/albatross/__init__.py similarity index 100% rename from scripts/workspaces/albatross-root-workspace/src/albatross/__init__.py rename to test/workspaces/albatross-root-workspace/src/albatross/__init__.py diff --git a/scripts/workspaces/albatross-virtual-workspace/packages/Unrelated.md b/test/workspaces/albatross-virtual-workspace/packages/Unrelated.md similarity index 100% rename from scripts/workspaces/albatross-virtual-workspace/packages/Unrelated.md rename to test/workspaces/albatross-virtual-workspace/packages/Unrelated.md diff --git a/scripts/workspaces/albatross-virtual-workspace/packages/albatross/check_installed_albatross.py b/test/workspaces/albatross-virtual-workspace/packages/albatross/check_installed_albatross.py similarity index 100% rename from scripts/workspaces/albatross-virtual-workspace/packages/albatross/check_installed_albatross.py rename to test/workspaces/albatross-virtual-workspace/packages/albatross/check_installed_albatross.py diff --git a/scripts/workspaces/albatross-virtual-workspace/packages/albatross/pyproject.toml b/test/workspaces/albatross-virtual-workspace/packages/albatross/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-virtual-workspace/packages/albatross/pyproject.toml rename to test/workspaces/albatross-virtual-workspace/packages/albatross/pyproject.toml diff --git a/scripts/workspaces/albatross-virtual-workspace/packages/albatross/src/albatross/__init__.py b/test/workspaces/albatross-virtual-workspace/packages/albatross/src/albatross/__init__.py similarity index 100% rename from scripts/workspaces/albatross-virtual-workspace/packages/albatross/src/albatross/__init__.py rename to test/workspaces/albatross-virtual-workspace/packages/albatross/src/albatross/__init__.py diff --git a/scripts/workspaces/albatross-virtual-workspace/packages/bird-feeder/check_installed_bird_feeder.py b/test/workspaces/albatross-virtual-workspace/packages/bird-feeder/check_installed_bird_feeder.py similarity index 100% rename from scripts/workspaces/albatross-virtual-workspace/packages/bird-feeder/check_installed_bird_feeder.py rename to test/workspaces/albatross-virtual-workspace/packages/bird-feeder/check_installed_bird_feeder.py diff --git a/scripts/workspaces/albatross-virtual-workspace/packages/bird-feeder/pyproject.toml b/test/workspaces/albatross-virtual-workspace/packages/bird-feeder/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-virtual-workspace/packages/bird-feeder/pyproject.toml rename to test/workspaces/albatross-virtual-workspace/packages/bird-feeder/pyproject.toml diff --git a/scripts/workspaces/albatross-virtual-workspace/packages/bird-feeder/src/bird_feeder/__init__.py b/test/workspaces/albatross-virtual-workspace/packages/bird-feeder/src/bird_feeder/__init__.py similarity index 100% rename from scripts/workspaces/albatross-virtual-workspace/packages/bird-feeder/src/bird_feeder/__init__.py rename to test/workspaces/albatross-virtual-workspace/packages/bird-feeder/src/bird_feeder/__init__.py diff --git a/scripts/workspaces/albatross-virtual-workspace/packages/seeds/pyproject.toml b/test/workspaces/albatross-virtual-workspace/packages/seeds/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-virtual-workspace/packages/seeds/pyproject.toml rename to test/workspaces/albatross-virtual-workspace/packages/seeds/pyproject.toml diff --git a/scripts/workspaces/albatross-virtual-workspace/packages/seeds/src/seeds/__init__.py b/test/workspaces/albatross-virtual-workspace/packages/seeds/src/seeds/__init__.py similarity index 100% rename from scripts/workspaces/albatross-virtual-workspace/packages/seeds/src/seeds/__init__.py rename to test/workspaces/albatross-virtual-workspace/packages/seeds/src/seeds/__init__.py diff --git a/scripts/workspaces/albatross-virtual-workspace/pyproject.toml b/test/workspaces/albatross-virtual-workspace/pyproject.toml similarity index 100% rename from scripts/workspaces/albatross-virtual-workspace/pyproject.toml rename to test/workspaces/albatross-virtual-workspace/pyproject.toml