Revert build config

astral-sh · Sep 6, 2024 · ebc1e30 · ebc1e30
1 parent af4ed30
commit ebc1e30
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 148 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/uv-dispatch/src/lib.rs b/crates/uv-dispatch/src/lib.rs
@@ -214,7 +214,6 @@ impl<'a> BuildContext for BuildDispatch<'a> {
             &BuildOptions::default(),
             self.hasher,
             self.index_locations,
-            self.config_settings,
             self.cache(),
             venv,
             &markers,

diff --git a/crates/uv-distribution/Cargo.toml b/crates/uv-distribution/Cargo.toml
@@ -13,7 +13,6 @@ license = { workspace = true }
 workspace = true
 
 [dependencies]
-cache-key = { workspace = true }
 distribution-filename = { workspace = true }
 distribution-types = { workspace = true }
 install-wheel-rs = { workspace = true }

diff --git a/crates/uv-distribution/src/index/built_wheel_index.rs b/crates/uv-distribution/src/index/built_wheel_index.rs
@@ -7,7 +7,6 @@ use distribution_types::{
 use platform_tags::Tags;
 use uv_cache::{Cache, CacheBucket, CacheShard, WheelCache};
 use uv_cache_info::CacheInfo;
-use uv_configuration::ConfigSettings;
 use uv_fs::symlinks;
 use uv_types::HashStrategy;
 
@@ -17,22 +16,15 @@ pub struct BuiltWheelIndex<'a> {
     cache: &'a Cache,
     tags: &'a Tags,
     hasher: &'a HashStrategy,
-    build_configuration: &'a ConfigSettings,
 }
 
 impl<'a> BuiltWheelIndex<'a> {
     /// Initialize an index of built distributions.
-    pub fn new(
-        cache: &'a Cache,
-        tags: &'a Tags,
-        hasher: &'a HashStrategy,
-        build_configuration: &'a ConfigSettings,
-    ) -> Self {
+    pub fn new(cache: &'a Cache, tags: &'a Tags, hasher: &'a HashStrategy) -> Self {
         Self {
             cache,
             tags,
             hasher,
-            build_configuration,
         }
     }
 
@@ -61,13 +53,6 @@ impl<'a> BuiltWheelIndex<'a> {
 
         let cache_shard = cache_shard.shard(revision.id());
 
-        // If there are build settings, we need to scope to a cache shard.
-        let cache_shard = if self.build_configuration.is_empty() {
-            cache_shard
-        } else {
-            cache_shard.shard(cache_key::cache_digest(self.build_configuration))
-        };
-
         Ok(self.find(&cache_shard))
     }
     /// Return the most compatible [`CachedWheel`] for a given source distribution at a local path.
@@ -98,13 +83,6 @@ impl<'a> BuiltWheelIndex<'a> {
 
         let cache_shard = cache_shard.shard(revision.id());
 
-        // If there are build settings, we need to scope to a cache shard.
-        let cache_shard = if self.build_configuration.is_empty() {
-            cache_shard
-        } else {
-            cache_shard.shard(cache_key::cache_digest(self.build_configuration))
-        };
-
         Ok(self
             .find(&cache_shard)
             .map(|wheel| wheel.with_cache_info(cache_info)))
@@ -147,13 +125,6 @@ impl<'a> BuiltWheelIndex<'a> {
 
         let cache_shard = cache_shard.shard(revision.id());
 
-        // If there are build settings, we need to scope to a cache shard.
-        let cache_shard = if self.build_configuration.is_empty() {
-            cache_shard
-        } else {
-            cache_shard.shard(cache_key::cache_digest(self.build_configuration))
-        };
-
         Ok(self
             .find(&cache_shard)
             .map(|wheel| wheel.with_cache_info(cache_info)))
@@ -173,13 +144,6 @@ impl<'a> BuiltWheelIndex<'a> {
             WheelCache::Git(&source_dist.url, &git_sha.to_short_string()).root(),
         );
 
-        // If there are build settings, we need to scope to a cache shard.
-        let cache_shard = if self.build_configuration.is_empty() {
-            cache_shard
-        } else {
-            cache_shard.shard(cache_key::cache_digest(self.build_configuration))
-        };
-
         self.find(&cache_shard)
     }
 

diff --git a/crates/uv-distribution/src/source/mod.rs b/crates/uv-distribution/src/source/mod.rs
@@ -426,14 +426,6 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
         // freshness, since entries have to be fresher than the revision itself.
         let cache_shard = cache_shard.shard(revision.id());
 
-        // If there are build settings, we need to scope to a cache shard.
-        let config_settings = self.build_context.config_settings();
-        let cache_shard = if config_settings.is_empty() {
-            cache_shard
-        } else {
-            cache_shard.shard(cache_key::cache_digest(config_settings))
-        };
-
         // If the cache contains a compatible wheel, return it.
         if let Some(built_wheel) = BuiltWheelMetadata::find_in_cache(tags, &cache_shard) {
             return Ok(built_wheel.with_hashes(revision.into_hashes()));
@@ -527,14 +519,6 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
             });
         }
 
-        // If there are build settings, we need to scope to a cache shard.
-        let config_settings = self.build_context.config_settings();
-        let cache_shard = if config_settings.is_empty() {
-            cache_shard
-        } else {
-            cache_shard.shard(cache_key::cache_digest(config_settings))
-        };
-
         // Otherwise, we either need to build the metadata.
         // If the backend supports `prepare_metadata_for_build_wheel`, use it.
         if let Some(metadata) = self
@@ -687,14 +671,6 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
         // freshness, since entries have to be fresher than the revision itself.
         let cache_shard = cache_shard.shard(revision.id());
 
-        // If there are build settings, we need to scope to a cache shard.
-        let config_settings = self.build_context.config_settings();
-        let cache_shard = if config_settings.is_empty() {
-            cache_shard
-        } else {
-            cache_shard.shard(cache_key::cache_digest(config_settings))
-        };
-
         // If the cache contains a compatible wheel, return it.
         if let Some(built_wheel) = BuiltWheelMetadata::find_in_cache(tags, &cache_shard) {
             return Ok(built_wheel);
@@ -805,14 +781,6 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
             });
         }
 
-        // If there are build settings, we need to scope to a cache shard.
-        let config_settings = self.build_context.config_settings();
-        let cache_shard = if config_settings.is_empty() {
-            cache_shard
-        } else {
-            cache_shard.shard(cache_key::cache_digest(config_settings))
-        };
-
         // Otherwise, we need to build a wheel.
         let task = self
             .reporter
@@ -929,14 +897,6 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
         // freshness, since entries have to be fresher than the revision itself.
         let cache_shard = cache_shard.shard(revision.id());
 
-        // If there are build settings, we need to scope to a cache shard.
-        let config_settings = self.build_context.config_settings();
-        let cache_shard = if config_settings.is_empty() {
-            cache_shard
-        } else {
-            cache_shard.shard(cache_key::cache_digest(config_settings))
-        };
-
         // If the cache contains a compatible wheel, return it.
         if let Some(built_wheel) = BuiltWheelMetadata::find_in_cache(tags, &cache_shard) {
             return Ok(built_wheel);
@@ -1060,14 +1020,6 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
             ));
         }
 
-        // If there are build settings, we need to scope to a cache shard.
-        let config_settings = self.build_context.config_settings();
-        let cache_shard = if config_settings.is_empty() {
-            cache_shard
-        } else {
-            cache_shard.shard(cache_key::cache_digest(config_settings))
-        };
-
         // Otherwise, we need to build a wheel.
         let task = self
             .reporter
@@ -1179,14 +1131,6 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
 
         let _lock = lock_shard(&cache_shard).await?;
 
-        // If there are build settings, we need to scope to a cache shard.
-        let config_settings = self.build_context.config_settings();
-        let cache_shard = if config_settings.is_empty() {
-            cache_shard
-        } else {
-            cache_shard.shard(cache_key::cache_digest(config_settings))
-        };
-
         // If the cache contains a compatible wheel, return it.
         if let Some(built_wheel) = BuiltWheelMetadata::find_in_cache(tags, &cache_shard) {
             return Ok(built_wheel);
@@ -1313,14 +1257,6 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
             ));
         }
 
-        // If there are build settings, we need to scope to a cache shard.
-        let config_settings = self.build_context.config_settings();
-        let cache_shard = if config_settings.is_empty() {
-            cache_shard
-        } else {
-            cache_shard.shard(cache_key::cache_digest(config_settings))
-        };
-
         // Otherwise, we need to build a wheel.
         let task = self
             .reporter

diff --git a/crates/uv-installer/src/plan.rs b/crates/uv-installer/src/plan.rs
@@ -15,7 +15,7 @@ use platform_tags::Tags;
 use pypi_types::{Requirement, RequirementSource, ResolverMarkerEnvironment};
 use uv_cache::{Cache, CacheBucket, WheelCache};
 use uv_cache_info::{CacheInfo, Timestamp};
-use uv_configuration::{BuildOptions, ConfigSettings, Reinstall};
+use uv_configuration::{BuildOptions, Reinstall};
 use uv_distribution::{
     BuiltWheelIndex, HttpArchivePointer, LocalArchivePointer, RegistryWheelIndex,
 };
@@ -57,15 +57,14 @@ impl<'a> Planner<'a> {
         build_options: &BuildOptions,
         hasher: &HashStrategy,
         index_locations: &IndexLocations,
-        config_settings: &ConfigSettings,
         cache: &Cache,
         venv: &PythonEnvironment,
         markers: &ResolverMarkerEnvironment,
         tags: &Tags,
     ) -> Result<Plan> {
         // Index all the already-downloaded wheels in the cache.
         let mut registry_index = RegistryWheelIndex::new(cache, tags, index_locations, hasher);
-        let built_index = BuiltWheelIndex::new(cache, tags, hasher, config_settings);
+        let built_index = BuiltWheelIndex::new(cache, tags, hasher);
 
         let mut cached = vec![];
         let mut remote = vec![];

diff --git a/crates/uv/src/commands/pip/install.rs b/crates/uv/src/commands/pip/install.rs
@@ -407,7 +407,6 @@ pub(crate) async fn pip_install(
         link_mode,
         compile,
         &index_locations,
-        config_settings,
         &hasher,
         &markers,
         &tags,

diff --git a/crates/uv/src/commands/pip/operations.rs b/crates/uv/src/commands/pip/operations.rs
@@ -21,8 +21,7 @@ use pypi_types::ResolverMarkerEnvironment;
 use uv_cache::Cache;
 use uv_client::{BaseClientBuilder, RegistryClient};
 use uv_configuration::{
-    BuildOptions, Concurrency, ConfigSettings, Constraints, ExtrasSpecification, Overrides,
-    Reinstall, Upgrade,
+    BuildOptions, Concurrency, Constraints, ExtrasSpecification, Overrides, Reinstall, Upgrade,
 };
 use uv_dispatch::BuildDispatch;
 use uv_distribution::DistributionDatabase;
@@ -350,7 +349,6 @@ pub(crate) async fn install(
     link_mode: LinkMode,
     compile: bool,
     index_urls: &IndexLocations,
-    config_settings: &ConfigSettings,
     hasher: &HashStrategy,
     markers: &ResolverMarkerEnvironment,
     tags: &Tags,
@@ -378,7 +376,6 @@ pub(crate) async fn install(
             build_options,
             hasher,
             index_urls,
-            config_settings,
             cache,
             venv,
             markers,

diff --git a/crates/uv/src/commands/pip/sync.rs b/crates/uv/src/commands/pip/sync.rs
@@ -359,7 +359,6 @@ pub(crate) async fn pip_sync(
         link_mode,
         compile,
         &index_locations,
-        config_settings,
         &hasher,
         &markers,
         &tags,

diff --git a/crates/uv/src/commands/project/mod.rs b/crates/uv/src/commands/project/mod.rs
@@ -807,7 +807,6 @@ pub(crate) async fn sync_environment(
         link_mode,
         compile_bytecode,
         index_locations,
-        config_setting,
         &hasher,
         &markers,
         tags,
@@ -1040,7 +1039,6 @@ pub(crate) async fn update_environment(
         *link_mode,
         *compile_bytecode,
         index_locations,
-        config_setting,
         &hasher,
         &markers,
         tags,

diff --git a/crates/uv/src/commands/project/sync.rs b/crates/uv/src/commands/project/sync.rs
@@ -304,7 +304,6 @@ pub(super) async fn do_sync(
         link_mode,
         compile_bytecode,
         index_locations,
-        config_setting,
         &hasher,
         &markers,
         tags,

diff --git a/crates/uv/tests/pip_install.rs b/crates/uv/tests/pip_install.rs
@@ -2764,37 +2764,9 @@ fn config_settings() {
         .join("__editable___setuptools_editable_0_1_0_finder.py");
     assert!(finder.exists());
 
-    // Reinstalling with `--editable_mode=compat` should be a no-op; changes in build configuration
-    // don't invalidate the environment.
-    uv_snapshot!(context.filters(), context.pip_install()
-        .arg("-e")
-        .arg(context.workspace_root.join("scripts/packages/setuptools_editable"))
-        .arg("-C")
-        .arg("editable_mode=compat")
-        , @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    Audited 1 package in [TIME]
-    "###
-    );
-
-    // Uninstall the package.
-    uv_snapshot!(context.filters(), context.pip_uninstall()
-        .arg("setuptools-editable"), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    Uninstalled 1 package in [TIME]
-     - setuptools-editable==0.1.0 (from file://[WORKSPACE]/scripts/packages/setuptools_editable)
-    "###);
+    // Install the editable package with `--editable_mode=compat`.
+    let context = TestContext::new("3.12");
 
-    // Install the editable package with `--editable_mode=compat`. We should ignore the cached
-    // build configuration and rebuild.
     uv_snapshot!(context.filters(), context.pip_install()
         .arg("-e")
         .arg(context.workspace_root.join("scripts/packages/setuptools_editable"))
@@ -2807,8 +2779,9 @@ fn config_settings() {
 
     ----- stderr -----
     Resolved 2 packages in [TIME]
-    Prepared 1 package in [TIME]
-    Installed 1 package in [TIME]
+    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)
     "###
     );