mirror of
https://github.com/astral-sh/uv.git
synced 2025-11-02 21:02:37 +00:00
Run cargo update (#14899)
This commit is contained in:
parent
396e198081
commit
7b8dd5cfaf
4 changed files with 483 additions and 526 deletions
7
.github/workflows/ci.yml
vendored
7
.github/workflows/ci.yml
vendored
|
|
@ -1969,6 +1969,10 @@ jobs:
|
||||||
- name: "Print Python path"
|
- name: "Print Python path"
|
||||||
run: echo $(which python3)
|
run: echo $(which python3)
|
||||||
|
|
||||||
|
# Needed for building Pydantic
|
||||||
|
- name: "Install build tools"
|
||||||
|
run: dnf install -y gcc
|
||||||
|
|
||||||
- name: "Validate global Python install"
|
- name: "Validate global Python install"
|
||||||
run: python3 scripts/check_system_python.py --uv ./uv
|
run: python3 scripts/check_system_python.py --uv ./uv
|
||||||
|
|
||||||
|
|
@ -2465,6 +2469,9 @@ jobs:
|
||||||
- name: "Print Python path"
|
- name: "Print Python path"
|
||||||
run: echo $(which python3)
|
run: echo $(which python3)
|
||||||
|
|
||||||
|
- name: Install build tools
|
||||||
|
run: yum install -y gcc
|
||||||
|
|
||||||
- name: "Validate global Python install"
|
- name: "Validate global Python install"
|
||||||
run: python3 scripts/check_system_python.py --uv ./uv
|
run: python3 scripts/check_system_python.py --uv ./uv
|
||||||
|
|
||||||
|
|
|
||||||
966
Cargo.lock
generated
966
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -107,10 +107,10 @@ impl<'a> Installer<'a> {
|
||||||
rayon::spawn(move || {
|
rayon::spawn(move || {
|
||||||
let result = install(
|
let result = install(
|
||||||
wheels,
|
wheels,
|
||||||
layout,
|
&layout,
|
||||||
installer_name,
|
installer_name.as_ref(),
|
||||||
link_mode,
|
link_mode,
|
||||||
reporter,
|
reporter.as_ref(),
|
||||||
relocatable,
|
relocatable,
|
||||||
installer_metadata,
|
installer_metadata,
|
||||||
);
|
);
|
||||||
|
|
@ -137,10 +137,10 @@ impl<'a> Installer<'a> {
|
||||||
|
|
||||||
install(
|
install(
|
||||||
wheels,
|
wheels,
|
||||||
self.venv.interpreter().layout(),
|
&self.venv.interpreter().layout(),
|
||||||
self.name,
|
self.name.as_ref(),
|
||||||
self.link_mode,
|
self.link_mode,
|
||||||
self.reporter,
|
self.reporter.as_ref(),
|
||||||
self.venv.relocatable(),
|
self.venv.relocatable(),
|
||||||
self.metadata,
|
self.metadata,
|
||||||
)
|
)
|
||||||
|
|
@ -151,10 +151,10 @@ impl<'a> Installer<'a> {
|
||||||
#[instrument(skip_all, fields(num_wheels = %wheels.len()))]
|
#[instrument(skip_all, fields(num_wheels = %wheels.len()))]
|
||||||
fn install(
|
fn install(
|
||||||
wheels: Vec<CachedDist>,
|
wheels: Vec<CachedDist>,
|
||||||
layout: Layout,
|
layout: &Layout,
|
||||||
installer_name: Option<String>,
|
installer_name: Option<&String>,
|
||||||
link_mode: LinkMode,
|
link_mode: LinkMode,
|
||||||
reporter: Option<Arc<dyn Reporter>>,
|
reporter: Option<&Arc<dyn Reporter>>,
|
||||||
relocatable: bool,
|
relocatable: bool,
|
||||||
installer_metadata: bool,
|
installer_metadata: bool,
|
||||||
) -> Result<Vec<CachedDist>> {
|
) -> Result<Vec<CachedDist>> {
|
||||||
|
|
@ -163,7 +163,7 @@ fn install(
|
||||||
let locks = uv_install_wheel::Locks::default();
|
let locks = uv_install_wheel::Locks::default();
|
||||||
wheels.par_iter().try_for_each(|wheel| {
|
wheels.par_iter().try_for_each(|wheel| {
|
||||||
uv_install_wheel::install_wheel(
|
uv_install_wheel::install_wheel(
|
||||||
&layout,
|
layout,
|
||||||
relocatable,
|
relocatable,
|
||||||
wheel.path(),
|
wheel.path(),
|
||||||
wheel.filename(),
|
wheel.filename(),
|
||||||
|
|
@ -176,7 +176,7 @@ fn install(
|
||||||
} else {
|
} else {
|
||||||
Some(wheel.cache_info())
|
Some(wheel.cache_info())
|
||||||
},
|
},
|
||||||
installer_name.as_deref(),
|
installer_name.map(String::as_str),
|
||||||
installer_metadata,
|
installer_metadata,
|
||||||
link_mode,
|
link_mode,
|
||||||
&locks,
|
&locks,
|
||||||
|
|
|
||||||
|
|
@ -290,7 +290,7 @@ impl<Provider: ResolverProvider, InstalledPackages: InstalledPackagesProvider>
|
||||||
thread::Builder::new()
|
thread::Builder::new()
|
||||||
.name("uv-resolver".into())
|
.name("uv-resolver".into())
|
||||||
.spawn(move || {
|
.spawn(move || {
|
||||||
let result = solver.solve(request_sink);
|
let result = solver.solve(&request_sink);
|
||||||
|
|
||||||
// This may fail if the main thread returned early due to an error.
|
// This may fail if the main thread returned early due to an error.
|
||||||
let _ = tx.send(result);
|
let _ = tx.send(result);
|
||||||
|
|
@ -311,7 +311,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
|
||||||
#[instrument(skip_all)]
|
#[instrument(skip_all)]
|
||||||
fn solve(
|
fn solve(
|
||||||
self: Arc<Self>,
|
self: Arc<Self>,
|
||||||
request_sink: Sender<Request>,
|
request_sink: &Sender<Request>,
|
||||||
) -> Result<ResolverOutput, ResolveError> {
|
) -> Result<ResolverOutput, ResolveError> {
|
||||||
debug!(
|
debug!(
|
||||||
"Solving with installed Python version: {}",
|
"Solving with installed Python version: {}",
|
||||||
|
|
@ -390,7 +390,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
|
||||||
&self.urls,
|
&self.urls,
|
||||||
&self.indexes,
|
&self.indexes,
|
||||||
&state.python_requirement,
|
&state.python_requirement,
|
||||||
&request_sink,
|
request_sink,
|
||||||
)?;
|
)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -494,7 +494,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
|
||||||
// since we weren't sure whether it might also be a URL requirement when
|
// since we weren't sure whether it might also be a URL requirement when
|
||||||
// transforming the requirements. For that case, we do another request here
|
// transforming the requirements. For that case, we do another request here
|
||||||
// (idempotent due to caching).
|
// (idempotent due to caching).
|
||||||
self.request_package(next_package, url, index, &request_sink)?;
|
self.request_package(next_package, url, index, request_sink)?;
|
||||||
|
|
||||||
let version = if let Some(version) = state.initial_version.take() {
|
let version = if let Some(version) = state.initial_version.take() {
|
||||||
// If we just forked based on platform support, we can skip version selection,
|
// If we just forked based on platform support, we can skip version selection,
|
||||||
|
|
@ -519,7 +519,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
|
||||||
&state.python_requirement,
|
&state.python_requirement,
|
||||||
&state.pubgrub,
|
&state.pubgrub,
|
||||||
&mut visited,
|
&mut visited,
|
||||||
&request_sink,
|
request_sink,
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
// Pick the next compatible version.
|
// Pick the next compatible version.
|
||||||
|
|
@ -651,7 +651,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
// Emit a request to fetch the metadata for each registry package.
|
// Emit a request to fetch the metadata for each registry package.
|
||||||
self.visit_dependencies(&dependencies, &state, &request_sink)
|
self.visit_dependencies(&dependencies, &state, request_sink)
|
||||||
.map_err(|err| {
|
.map_err(|err| {
|
||||||
enrich_dependency_error(err, next_id, &version, &state.pubgrub)
|
enrich_dependency_error(err, next_id, &version, &state.pubgrub)
|
||||||
})?;
|
})?;
|
||||||
|
|
@ -695,7 +695,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
|
||||||
state,
|
state,
|
||||||
&version,
|
&version,
|
||||||
forks,
|
forks,
|
||||||
&request_sink,
|
request_sink,
|
||||||
&diverging_packages,
|
&diverging_packages,
|
||||||
) {
|
) {
|
||||||
forked_states.push(new_fork_state?);
|
forked_states.push(new_fork_state?);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue