From c294c7098f1b2fc228c30e720702e927eb1a9e87 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Wed, 10 Apr 2024 18:00:51 -0400 Subject: [PATCH] Remove unnecessary `touch` calls from tests (#2981) You only need to `touch` if you don't end up writing to the file. --- crates/uv/tests/pip_check.rs | 7 +---- crates/uv/tests/pip_install.rs | 18 ------------- crates/uv/tests/pip_list.rs | 3 +-- crates/uv/tests/pip_show.rs | 10 +------ crates/uv/tests/pip_sync.rs | 45 +------------------------------- crates/uv/tests/pip_uninstall.rs | 8 ------ 6 files changed, 4 insertions(+), 87 deletions(-) diff --git a/crates/uv/tests/pip_check.rs b/crates/uv/tests/pip_check.rs index 61503a019..28e2aecdd 100644 --- a/crates/uv/tests/pip_check.rs +++ b/crates/uv/tests/pip_check.rs @@ -1,8 +1,8 @@ use std::process::Command; use anyhow::Result; +use assert_fs::fixture::FileWriteStr; use assert_fs::fixture::PathChild; -use assert_fs::fixture::{FileTouch, FileWriteStr}; use common::uv_snapshot; @@ -53,7 +53,6 @@ fn check_compatible_packages() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("requests==2.31.0")?; uv_snapshot!(install_command(&context) @@ -97,7 +96,6 @@ fn check_incompatible_packages() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("requests==2.31.0")?; uv_snapshot!(install_command(&context) @@ -121,7 +119,6 @@ fn check_incompatible_packages() -> Result<()> { ); let requirements_txt_idna = context.temp_dir.child("requirements_idna.txt"); - requirements_txt_idna.touch()?; requirements_txt_idna.write_str("idna==2.4")?; uv_snapshot!(install_command(&context) @@ -165,7 +162,6 @@ fn check_multiple_incompatible_packages() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("requests==2.31.0")?; uv_snapshot!(install_command(&context) @@ -189,7 +185,6 @@ fn check_multiple_incompatible_packages() -> Result<()> { ); let requirements_txt_two = context.temp_dir.child("requirements_two.txt"); - requirements_txt_two.touch()?; requirements_txt_two.write_str("idna==2.4\nurllib3==1.20")?; uv_snapshot!(install_command(&context) diff --git a/crates/uv/tests/pip_install.rs b/crates/uv/tests/pip_install.rs index b2f0b7b5b..055d84f36 100644 --- a/crates/uv/tests/pip_install.rs +++ b/crates/uv/tests/pip_install.rs @@ -413,7 +413,6 @@ fn respect_installed_and_reinstall() -> Result<()> { // Install Flask. let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("Flask==2.3.2")?; uv_snapshot!(context.install() @@ -442,7 +441,6 @@ fn respect_installed_and_reinstall() -> Result<()> { // Re-install Flask. We should respect the existing version. let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("Flask")?; uv_snapshot!(context.install() @@ -462,7 +460,6 @@ fn respect_installed_and_reinstall() -> Result<()> { // Install a newer version of Flask. We should upgrade it. let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("Flask==2.3.3")?; let filters = if cfg!(windows) { @@ -494,7 +491,6 @@ fn respect_installed_and_reinstall() -> Result<()> { // Re-install Flask. We should upgrade it. let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("Flask")?; uv_snapshot!(filters, context.install() @@ -518,7 +514,6 @@ fn respect_installed_and_reinstall() -> Result<()> { // Re-install Flask. We should install even though the version is current let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("Flask")?; uv_snapshot!(filters, context.install() @@ -577,7 +572,6 @@ fn reinstall_extras() -> Result<()> { // Re-install httpx, with an extra. let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("httpx[http2]")?; uv_snapshot!(context.install() @@ -610,7 +604,6 @@ fn reinstall_incomplete() -> Result<()> { // Install anyio. let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("anyio==3.7.0")?; uv_snapshot!(context.install() @@ -635,7 +628,6 @@ fn reinstall_incomplete() -> Result<()> { // Re-install anyio. let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("anyio==4.0.0")?; uv_snapshot!(context.filters(), context.install() @@ -665,7 +657,6 @@ fn allow_incompatibilities() -> Result<()> { // Install Flask, which relies on `Werkzeug>=3.0.0`. let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("Flask")?; uv_snapshot!(context.install() @@ -694,7 +685,6 @@ fn allow_incompatibilities() -> Result<()> { // Install an incompatible version of Jinja2. let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("jinja2==2.11.3")?; uv_snapshot!(context.install() @@ -2508,7 +2498,6 @@ fn no_build_isolation() -> Result<()> { fn install_utf16le_requirements() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_binary(&utf8_to_utf16_with_bom_le("tomli"))?; uv_snapshot!(context.install_without_exclude_newer() @@ -2535,7 +2524,6 @@ fn install_utf16le_requirements() -> Result<()> { fn install_utf16be_requirements() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_binary(&utf8_to_utf16_with_bom_be("tomli"))?; uv_snapshot!(context.install_without_exclude_newer() @@ -2579,7 +2567,6 @@ fn utf8_to_utf16_with_bom_be(s: &str) -> Vec { fn dry_run_install() -> std::result::Result<(), Box> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("httpx==0.25.1")?; uv_snapshot!(context.install() @@ -2612,7 +2599,6 @@ fn dry_run_install() -> std::result::Result<(), Box> { fn dry_run_install_url_dependency() -> std::result::Result<(), Box> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("anyio @ https://files.pythonhosted.org/packages/2d/b8/7333d87d5f03247215d86a86362fd3e324111788c6cdd8d2e6196a6ba833/anyio-4.2.0.tar.gz")?; uv_snapshot!(context.install() @@ -2641,7 +2627,6 @@ fn dry_run_install_url_dependency() -> std::result::Result<(), Box std::result::Result<(), Box> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("anyio @ https://files.pythonhosted.org/packages/2d/b8/7333d87d5f03247215d86a86362fd3e324111788c6cdd8d2e6196a6ba833/anyio-4.2.0.tar.gz")?; // Install the URL dependency @@ -2693,7 +2678,6 @@ fn dry_run_uninstall_url_dependency() -> std::result::Result<(), Box std::result::Result<(), Box> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("httpx==0.25.1")?; // Install the package @@ -2744,7 +2728,6 @@ fn dry_run_install_transitive_dependency_already_installed( let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("httpcore==1.0.2")?; // Install a dependency of httpx @@ -2795,7 +2778,6 @@ fn dry_run_install_transitive_dependency_already_installed( fn dry_run_install_then_upgrade() -> std::result::Result<(), Box> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("httpx==0.25.0")?; // Install the package diff --git a/crates/uv/tests/pip_list.rs b/crates/uv/tests/pip_list.rs index e738f96c6..4b4fb7b36 100644 --- a/crates/uv/tests/pip_list.rs +++ b/crates/uv/tests/pip_list.rs @@ -1,8 +1,8 @@ use std::process::Command; use anyhow::Result; +use assert_fs::fixture::FileWriteStr; use assert_fs::fixture::PathChild; -use assert_fs::fixture::{FileTouch, FileWriteStr}; use common::uv_snapshot; @@ -59,7 +59,6 @@ fn list_single_no_editable() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; uv_snapshot!(install_command(&context) diff --git a/crates/uv/tests/pip_show.rs b/crates/uv/tests/pip_show.rs index 2d3cc984e..4bfbbce15 100644 --- a/crates/uv/tests/pip_show.rs +++ b/crates/uv/tests/pip_show.rs @@ -3,8 +3,8 @@ use std::process::Command; use anyhow::Result; use assert_cmd::prelude::*; +use assert_fs::fixture::FileWriteStr; use assert_fs::fixture::PathChild; -use assert_fs::fixture::{FileTouch, FileWriteStr}; use indoc::indoc; use common::uv_snapshot; @@ -63,7 +63,6 @@ fn show_requires_multiple() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("requests==2.31.0")?; uv_snapshot!(install_command(&context) @@ -119,7 +118,6 @@ fn show_python_version_marker() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("click==8.1.7")?; uv_snapshot!(install_command(&context) @@ -175,7 +173,6 @@ fn show_found_single_package() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; uv_snapshot!(install_command(&context) @@ -226,7 +223,6 @@ fn show_found_multiple_packages() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str(indoc! {r" MarkupSafe==2.1.3 pip==21.3.1 @@ -289,7 +285,6 @@ fn show_found_one_out_of_three() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str(indoc! {r" MarkupSafe==2.1.3 pip==21.3.1 @@ -348,7 +343,6 @@ fn show_found_one_out_of_two_quiet() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str(indoc! {r" MarkupSafe==2.1.3 pip==21.3.1 @@ -402,7 +396,6 @@ fn show_empty_quiet() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str(indoc! {r" MarkupSafe==2.1.3 pip==21.3.1 @@ -497,7 +490,6 @@ fn show_required_by_multiple() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str(indoc! {r" anyio==4.0.0 requests==2.31.0 diff --git a/crates/uv/tests/pip_sync.rs b/crates/uv/tests/pip_sync.rs index bc07eafc7..37365b8a2 100644 --- a/crates/uv/tests/pip_sync.rs +++ b/crates/uv/tests/pip_sync.rs @@ -142,7 +142,6 @@ fn install() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; uv_snapshot!(command(&context) @@ -184,7 +183,6 @@ fn install_copy() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; uv_snapshot!(command(&context) @@ -220,7 +218,6 @@ fn install_hardlink() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; uv_snapshot!(command(&context) @@ -256,7 +253,6 @@ fn install_many() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3\ntomli==2.0.1")?; uv_snapshot!(command(&context) @@ -288,7 +284,6 @@ fn noop() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; command(&context) @@ -322,7 +317,6 @@ fn link() -> Result<()> { let venv1 = &context.venv; let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; Command::new(get_bin()) @@ -384,7 +378,6 @@ fn add_remove() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; command(&context) @@ -394,7 +387,6 @@ fn add_remove() -> Result<()> { .success(); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("tomli==2.0.1")?; uv_snapshot!(command(&context) @@ -427,7 +419,6 @@ fn install_sequential() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; command(&context) @@ -437,7 +428,6 @@ fn install_sequential() -> Result<()> { .success(); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3\ntomli==2.0.1")?; uv_snapshot!(command(&context) @@ -469,7 +459,6 @@ fn upgrade() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("tomli==2.0.0")?; command(&context) @@ -479,7 +468,6 @@ fn upgrade() -> Result<()> { .success(); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("tomli==2.0.1")?; uv_snapshot!(command(&context) @@ -510,7 +498,6 @@ fn install_url() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("werkzeug @ https://files.pythonhosted.org/packages/ff/1d/960bb4017c68674a1cb099534840f18d3def3ce44aed12b5ed8b78e0153e/Werkzeug-2.0.0-py3-none-any.whl")?; uv_snapshot!(command(&context) @@ -540,7 +527,6 @@ fn install_git_commit() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("werkzeug @ git+https://github.com/pallets/werkzeug.git@af160e0b6b7ddd81c22f1652c728ff5ac72d5c74")?; uv_snapshot!(command(&context) @@ -570,7 +556,6 @@ fn install_git_tag() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("werkzeug @ git+https://github.com/pallets/WerkZeug.git@2.0.0")?; uv_snapshot!(command(&context) @@ -600,7 +585,6 @@ fn install_git_subdirectories() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("example-pkg-a @ git+https://github.com/pypa/sample-namespace-packages.git@df7530eeb8fa0cb7dbb8ecb28363e8e36bfa2f45#subdirectory=pkg_resources/pkg_a\nexample-pkg-b @ git+https://github.com/pypa/sample-namespace-packages.git@df7530eeb8fa0cb7dbb8ecb28363e8e36bfa2f45#subdirectory=pkg_resources/pkg_b")?; uv_snapshot!(command(&context) @@ -632,7 +616,6 @@ fn install_sdist() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("Werkzeug==0.9.6")?; uv_snapshot!(command(&context) @@ -661,7 +644,6 @@ fn install_sdist_url() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("Werkzeug @ https://files.pythonhosted.org/packages/63/69/5702e5eb897d1a144001e21d676676bcb87b88c0862f947509ea95ea54fc/Werkzeug-0.9.6.tar.gz")?; uv_snapshot!(command(&context) @@ -691,7 +673,6 @@ fn install_url_then_install_url() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("werkzeug @ https://files.pythonhosted.org/packages/ff/1d/960bb4017c68674a1cb099534840f18d3def3ce44aed12b5ed8b78e0153e/Werkzeug-2.0.0-py3-none-any.whl")?; command(&context) @@ -724,7 +705,6 @@ fn install_url_then_install_version() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("werkzeug @ https://files.pythonhosted.org/packages/ff/1d/960bb4017c68674a1cb099534840f18d3def3ce44aed12b5ed8b78e0153e/Werkzeug-2.0.0-py3-none-any.whl")?; command(&context) @@ -734,7 +714,6 @@ fn install_url_then_install_version() -> Result<()> { .success(); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("werkzeug==2.0.0")?; uv_snapshot!(command(&context) @@ -761,7 +740,6 @@ fn install_version_then_install_url() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("werkzeug==2.0.0")?; command(&context) @@ -771,7 +749,6 @@ fn install_version_then_install_url() -> Result<()> { .success(); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("werkzeug @ https://files.pythonhosted.org/packages/ff/1d/960bb4017c68674a1cb099534840f18d3def3ce44aed12b5ed8b78e0153e/Werkzeug-2.0.0-py3-none-any.whl")?; uv_snapshot!(command(&context) @@ -803,7 +780,6 @@ fn install_numpy_py38() -> Result<()> { let context = TestContext::new("3.8"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("numpy")?; uv_snapshot!(command(&context) @@ -832,7 +808,6 @@ fn install_no_index() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; uv_snapshot!(command(&context) @@ -863,7 +838,6 @@ fn install_no_index_cached() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; uv_snapshot!(command(&context) @@ -913,10 +887,8 @@ fn install_no_index_cached() -> Result<()> { fn warn_on_yanked_version() -> Result<()> { let context = TestContext::new("3.12"); - let requirements_in = context.temp_dir.child("requirements.txt"); - requirements_in.touch()?; - // This version is yanked. + let requirements_in = context.temp_dir.child("requirements.txt"); requirements_in.write_str("colorama==0.4.2")?; uv_snapshot!(context.filters(), windows_filters=false, command(&context) @@ -1167,7 +1139,6 @@ fn install_ujson() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("ujson @ https://files.pythonhosted.org/packages/43/1a/b0a027144aa5c8f4ea654f4afdd634578b450807bb70b9f8bad00d6f6d3c/ujson-5.7.0.tar.gz")?; uv_snapshot!(command(&context) @@ -1207,7 +1178,6 @@ fn install_build_system_no_backend() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("build-system-no-backend @ https://files.pythonhosted.org/packages/ec/25/1e531108ca027dc3a3b37d351f4b86d811df4884c6a81cd99e73b8b589f5/build-system-no-backend-0.1.0.tar.gz")?; uv_snapshot!(command(&context) @@ -1238,7 +1208,6 @@ fn install_url_source_dist_cached() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("tqdm @ https://files.pythonhosted.org/packages/62/06/d5604a70d160f6a6ca5fd2ba25597c24abd5c5ca5f437263d177ac242308/tqdm-4.66.1.tar.gz")?; let filters = if cfg!(windows) { @@ -1336,7 +1305,6 @@ fn install_git_source_dist_cached() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("werkzeug @ git+https://github.com/pallets/werkzeug.git@af160e0b6b7ddd81c22f1652c728ff5ac72d5c74")?; uv_snapshot!(command(&context) @@ -1433,7 +1401,6 @@ fn install_registry_source_dist_cached() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("future==0.18.3")?; uv_snapshot!(command(&context) @@ -1742,7 +1709,6 @@ fn install_url_built_dist_cached() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("tqdm @ https://files.pythonhosted.org/packages/00/e5/f12a80907d0884e6dff9c16d0c0114d81b8cd07dc3ae54c5e962cc83037e/tqdm-4.66.1-py3-none-any.whl")?; let filters = if cfg!(windows) { @@ -1839,7 +1805,6 @@ fn duplicate_package_overlap() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3\nMarkupSafe==2.1.2")?; uv_snapshot!(command(&context) @@ -1864,7 +1829,6 @@ fn duplicate_package_disjoint() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3\nMarkupSafe==2.1.2 ; python_version < '3.6'")?; uv_snapshot!(command(&context) @@ -1891,7 +1855,6 @@ fn reinstall() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3\ntomli==2.0.1")?; uv_snapshot!(command(&context) @@ -1944,7 +1907,6 @@ fn reinstall_package() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3\ntomli==2.0.1")?; uv_snapshot!(command(&context) @@ -1997,7 +1959,6 @@ fn reinstall_git() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("werkzeug @ git+https://github.com/pallets/werkzeug.git@af160e0b6b7ddd81c22f1652c728ff5ac72d5c74")?; uv_snapshot!(command(&context) @@ -2046,7 +2007,6 @@ fn refresh() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3\ntomli==2.0.1")?; uv_snapshot!(command(&context) @@ -2104,7 +2064,6 @@ fn refresh_package() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3\ntomli==2.0.1")?; uv_snapshot!(command(&context) @@ -2787,7 +2746,6 @@ fn pip_entrypoints() -> Result<()> { // TODO(konstin): Remove git dep when the next pip version is released. for pip_requirement in ["pip==24.0", "pip @ git+https://github.com/pypa/pip"] { let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str(pip_requirement)?; command(&context) @@ -2899,7 +2857,6 @@ fn compile() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; uv_snapshot!(command(&context) diff --git a/crates/uv/tests/pip_uninstall.rs b/crates/uv/tests/pip_uninstall.rs index 84349b184..b6808afb9 100644 --- a/crates/uv/tests/pip_uninstall.rs +++ b/crates/uv/tests/pip_uninstall.rs @@ -127,7 +127,6 @@ fn missing_requirements_txt() -> Result<()> { fn invalid_requirements_txt_requirement() -> Result<()> { let temp_dir = assert_fs::TempDir::new()?; let requirements_txt = temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("flask==1.0.x")?; uv_snapshot!(Command::new(get_bin()) @@ -155,7 +154,6 @@ fn uninstall() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; sync_command(&context) @@ -197,7 +195,6 @@ fn missing_record() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("MarkupSafe==2.1.3")?; sync_command(&context) @@ -235,7 +232,6 @@ fn uninstall_editable_by_name() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str(&format!( "-e {}", context @@ -283,7 +279,6 @@ fn uninstall_by_path() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str( context .workspace_root @@ -331,7 +326,6 @@ fn uninstall_duplicate_by_path() -> Result<()> { let context = TestContext::new("3.12"); let requirements_txt = context.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str( context .workspace_root @@ -383,7 +377,6 @@ fn uninstall_duplicate() -> Result<()> { // Sync a version of `pip` into a virtual environment. let context1 = TestContext::new("3.12"); let requirements_txt = context1.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("pip==21.3.1")?; // Run `pip sync`. @@ -395,7 +388,6 @@ fn uninstall_duplicate() -> Result<()> { // Sync a different version of `pip` into a virtual environment. let context2 = TestContext::new("3.12"); let requirements_txt = context2.temp_dir.child("requirements.txt"); - requirements_txt.touch()?; requirements_txt.write_str("pip==22.1.1")?; // Run `pip sync`.