mirror of
				https://github.com/astral-sh/uv.git
				synced 2025-10-31 12:06:13 +00:00 
			
		
		
		
	Handle universal vs. fork markers with ResolverMarkers (#5099)
				
					
				
			* Use a dedicated `ResolverMarkers` check in the fork state. This is better than the `MarkerTree::And(Vec::new())` check. * Report the timing correct naming universal resolution instead of two spaces around an empty string when there are no markers. * On resolution error, show the split that we're in. I'm not sure how to word this, since we're doing a universal resolution until we fork, so the trace may contain information from requirements that are not part of this fork.
This commit is contained in:
		
							parent
							
								
									fe403576c5
								
							
						
					
					
						commit
						a6dfd3953a
					
				
					 19 changed files with 220 additions and 133 deletions
				
			
		|  | @ -26,6 +26,7 @@ use uv_installer::{Installer, Plan, Planner, Preparer, SitePackages}; | |||
| use uv_python::{Interpreter, PythonEnvironment}; | ||||
| use uv_resolver::{ | ||||
|     ExcludeNewer, FlatIndex, InMemoryIndex, Manifest, OptionsBuilder, PythonRequirement, Resolver, | ||||
|     ResolverMarkers, | ||||
| }; | ||||
| use uv_types::{BuildContext, BuildIsolation, EmptyInstalledPackages, HashStrategy, InFlight}; | ||||
| 
 | ||||
|  | @ -146,7 +147,7 @@ impl<'a> BuildContext for BuildDispatch<'a> { | |||
|                 .index_strategy(self.index_strategy) | ||||
|                 .build(), | ||||
|             &python_requirement, | ||||
|             Some(markers), | ||||
|             ResolverMarkers::SpecificEnvironment(markers.clone()), | ||||
|             Some(tags), | ||||
|             self.flat_index, | ||||
|             self.index, | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 konsti
						konsti