Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade fs4 to 0.12.0 #2373

Merged
merged 1 commit into from
Dec 8, 2024
Merged

Upgrade fs4 to 0.12.0 #2373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 18 additions & 39 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ semver = "1.0.22"
target-lexicon = "0.12.14"
indexmap = "2.2.3"
pyproject-toml = "0.11.0"
python-pkginfo = "0.6.0"
python-pkginfo = "0.6.5"
textwrap = "0.16.1"
ignore = "0.4.20"
itertools = "0.12.1"
Expand Down Expand Up @@ -139,7 +139,7 @@ pretty_assertions = { version = "1.3.0", optional = true }

[dev-dependencies]
expect-test = "1.4.1"
fs4 = { version = "0.11.1", features = ["fs-err"] }
fs4 = { version = "0.12.0", features = ["fs-err3"] }
indoc = "2.0.3"
pretty_assertions = "1.3.0"
rstest = "0.22.0"
Expand Down
6 changes: 3 additions & 3 deletions tests/common/integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use anyhow::{bail, Context, Result};
#[cfg(feature = "zig")]
use cargo_zigbuild::Zig;
use clap::Parser;
use fs4::fs_std::FileExt;
use fs4::fs_err3::FileExt;
use fs_err::File;
use maturin::{BuildOptions, PlatformTag, PythonInterpreter, Target};
use normpath::PathExt;
Expand Down Expand Up @@ -90,7 +90,7 @@ pub fn test_integration(
// All tests try to use this venv at the same time, so we need to make sure only one
// modifies it at a time and that during that time, no other test reads it.
let file = File::create(venvs_dir.join("cffi-provider.lock"))?;
file.file().lock_exclusive()?;
file.lock_exclusive()?;
let python = if !cffi_venv.is_dir() {
create_named_virtualenv(cffi_provider, python_interp.clone().map(PathBuf::from))?;
let target_triple = Target::from_target_triple(None)?;
Expand Down Expand Up @@ -123,7 +123,7 @@ pub fn test_integration(
let target_triple = Target::from_target_triple(None)?;
target_triple.get_venv_python(&cffi_venv)
};
file.file().unlock()?;
file.unlock()?;
cli.push("--interpreter".into());
cli.push(python.as_os_str().to_owned());
}
Expand Down
Loading