Remove prebuiltLibraries from PythonPackageComponents

Summary: Removes prebuiltLibraries from PythonPackageComponents. We now extract sources from prebuilt_python_library and merge it into the top level module directory, so there's no need to keep this duplicate field around.

Test Plan: CI

Reviewed By: andrewjcg

fbshipit-source-id: 7cec967

src/com/facebook/buck/python/AbstractPythonPackageComponents.java

@@ -31,17 +31,14 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.SetMultimap;
 import java.nio.file.Path;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import org.immutables.value.Value;
 
 @Value.Immutable(builder = false, singleton = true)
@@ -60,11 +57,6 @@ abstract class AbstractPythonPackageComponents implements RuleKeyAppendable {
   @Value.Parameter
   public abstract Map<Path, SourcePath> getNativeLibraries();
 
-  // Pre-built python libraries (eggs, wheels). Note that source distributions
-  // will not work!
-  @Value.Parameter
-  public abstract Set<SourcePath> getPrebuiltLibraries();
-
   // Directories that pre-built python libraries are extracted to. Note that these
   // can refer to the same libraries that are in getPrebuiltLibraries, but these are
   // directories instead of archives. The key of this map is where to link the contents
@@ -109,7 +101,6 @@ public ImmutableCollection<BuildRule> getDeps(SourcePathRuleFinder ruleFinder) {
     deps.addAll(ruleFinder.filterBuildRuleInputs(getModules().values()));
     deps.addAll(ruleFinder.filterBuildRuleInputs(getResources().values()));
     deps.addAll(ruleFinder.filterBuildRuleInputs(getNativeLibraries().values()));
-    deps.addAll(ruleFinder.filterBuildRuleInputs(getPrebuiltLibraries()));
     deps.addAll(ruleFinder.filterBuildRuleInputs(getModuleDirs().values()));
 
     return deps.build();
@@ -128,7 +119,6 @@ public static class Builder {
     private final Map<Path, SourcePath> modules = new HashMap<>();
     private final Map<Path, SourcePath> resources = new HashMap<>();
     private final Map<Path, SourcePath> nativeLibraries = new HashMap<>();
-    private final Set<SourcePath> prebuiltLibraries = new LinkedHashSet<>();
     private final SetMultimap<Path, SourcePath> moduleDirs = HashMultimap.create();
     private Optional<Boolean> zipSafe = Optional.empty();
 
@@ -202,11 +192,6 @@ public Builder addNativeLibraries(Map<Path, SourcePath> sources, BuildTarget fro
       return add("native library", nativeLibraries, nativeLibrarySources, sources, from);
     }
 
-    public Builder addPrebuiltLibraries(Set<SourcePath> sources) {
-      prebuiltLibraries.addAll(sources);
-      return this;
-    }
-
     public Builder addModuleDirs(Multimap<Path, SourcePath> moduleDirs) {
       this.moduleDirs.putAll(moduleDirs);
       return this;
@@ -216,7 +201,6 @@ public Builder addComponent(PythonPackageComponents other, BuildTarget from) {
       addModules(other.getModules(), from);
       addResources(other.getResources(), from);
       addNativeLibraries(other.getNativeLibraries(), from);
-      addPrebuiltLibraries(other.getPrebuiltLibraries());
       addModuleDirs(other.getModuleDirs());
       addZipSafe(other.isZipSafe());
       return this;
@@ -236,7 +220,6 @@ public PythonPackageComponents build() {
           ImmutableMap.copyOf(modules),
           ImmutableMap.copyOf(resources),
           ImmutableMap.copyOf(nativeLibraries),
-          ImmutableSet.copyOf(prebuiltLibraries),
           ImmutableSetMultimap.copyOf(moduleDirs),
           zipSafe);
     }

src/com/facebook/buck/python/CxxPythonExtensionDescription.java

@@ -488,7 +488,6 @@ public PythonPackageComponents getPythonPackageComponents(
             ImmutableMap.of(module, output),
             ImmutableMap.of(),
             ImmutableMap.of(),
-            ImmutableSet.of(),
             ImmutableMultimap.of(),
             Optional.of(false));
       }

src/com/facebook/buck/python/PexStep.java

@@ -151,6 +151,7 @@ protected Optional<String> getStdin(ExecutionContext context) throws Interrupted
                   "modules", modulesBuilder.build(),
                   "resources", resourcesBuilder.build(),
                   "nativeLibraries", nativeLibrariesBuilder.build(),
+                  // prebuiltLibraries key kept for compatibility
                   "prebuiltLibraries", ImmutableList.<String>of())));
     } catch (IOException e) {
       throw new RuntimeException(e);

src/com/facebook/buck/python/PrebuiltPythonLibrary.java

@@ -36,7 +36,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -76,9 +75,6 @@ public PythonPackageComponents getPythonPackageComponents(
         ImmutableMap.of(),
         ImmutableMap.of(),
         ImmutableMap.of(),
-        // TODO: We'll be removing 'prebuiltLibraries' in a subsequent diff after
-        //       everything stops using it
-        ImmutableSet.of(binarySrc),
         ImmutableSetMultimap.of(Paths.get(""), Objects.requireNonNull(getSourcePathToOutput())),
         Optional.empty());
   }

src/com/facebook/buck/python/PythonBinaryDescription.java

@@ -292,7 +292,6 @@ public PythonBinary createBuildRule(
             modules.build(),
             /* resources */ ImmutableMap.of(),
             /* nativeLibraries */ ImmutableMap.of(),
-            /* prebuiltLibraries */ ImmutableSet.of(),
             /* moduleDirs */ ImmutableMultimap.of(),
             /* zipSafe */ args.getZipSafe());
 

src/com/facebook/buck/python/PythonLibraryDescription.java

@@ -48,7 +48,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import java.nio.file.Path;
 import java.util.Map;
@@ -152,7 +151,6 @@ public <U> Optional<U> createMetadata(
                       args.getVersionedResources(),
                       selectedVersions),
                   ImmutableMap.of(),
-                  ImmutableSet.of(),
                   ImmutableMultimap.of(),
                   args.getZipSafe());
 

src/com/facebook/buck/python/PythonTestDescription.java

@@ -309,7 +309,6 @@ public PythonTest createBuildRule(
                 .build(),
             resources,
             ImmutableMap.of(),
-            ImmutableSet.of(),
             ImmutableMultimap.of(),
             args.getZipSafe());
     ImmutableList<BuildRule> deps =

test/com/facebook/buck/python/CxxPythonExtensionDescriptionTest.java

@@ -231,7 +231,6 @@ public void createBuildRulePythonPackageable() throws Exception {
                 rule.getSourcePathToOutput()),
             ImmutableMap.of(),
             ImmutableMap.of(),
-            ImmutableSet.of(),
             ImmutableMultimap.of(),
             Optional.of(false));
     assertEquals(expectedComponents, actualComponent);

test/com/facebook/buck/python/PythonPackageableComponentsTest.java

@@ -27,7 +27,6 @@
 import com.facebook.buck.util.HumanReadableException;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -44,15 +43,13 @@ public void testMergeZipSafe() {
             ImmutableMap.of(Paths.get("test"), FakeSourcePath.of("sourceA")),
             ImmutableMap.of(),
             ImmutableMap.of(),
-            ImmutableSet.of(),
             ImmutableMultimap.of(),
             Optional.of(true));
     PythonPackageComponents compB =
         PythonPackageComponents.of(
             ImmutableMap.of(Paths.get("test2"), FakeSourcePath.of("sourceB")),
             ImmutableMap.of(),
             ImmutableMap.of(),
-            ImmutableSet.of(),
             ImmutableMultimap.of(),
             Optional.of(false));
 
@@ -89,15 +86,13 @@ public void testDuplicateSourcesInComponentsThrowsException() {
             ImmutableMap.of(dest, FakeSourcePath.of("sourceA")),
             ImmutableMap.of(),
             ImmutableMap.of(),
-            ImmutableSet.of(),
             ImmutableMultimap.of(),
             Optional.empty());
     PythonPackageComponents compB =
         PythonPackageComponents.of(
             ImmutableMap.of(dest, FakeSourcePath.of("sourceB")),
             ImmutableMap.of(),
             ImmutableMap.of(),
-            ImmutableSet.of(),
             ImmutableMultimap.of(),
             Optional.empty());
     PythonPackageComponents.Builder builder = new PythonPackageComponents.Builder(me);
@@ -121,15 +116,13 @@ public void testDuplicateIndeticalSourcesInComponentsIsOk() {
             ImmutableMap.of(dest, path),
             ImmutableMap.of(),
             ImmutableMap.of(),
-            ImmutableSet.of(),
             ImmutableMultimap.of(),
             Optional.empty());
     PythonPackageComponents compB =
         PythonPackageComponents.of(
             ImmutableMap.of(dest, path),
             ImmutableMap.of(),
             ImmutableMap.of(),
-            ImmutableSet.of(),
             ImmutableMultimap.of(),
             Optional.empty());
     PythonPackageComponents.Builder builder = new PythonPackageComponents.Builder(me);
@@ -160,7 +153,6 @@ public void testBuilderBuildsAndUpdates() {
                 FakeSourcePath.of("nativeA"),
                 Paths.get("nativeB.so"),
                 FakeSourcePath.of("nativeB")),
-            ImmutableSet.of(FakeSourcePath.of("archiveA.whl"), FakeSourcePath.of("archiveB.whl")),
             ImmutableSetMultimap.of(
                 Paths.get(""),
                 FakeSourcePath.of("extractedA.whl"),
@@ -173,15 +165,13 @@ public void testBuilderBuildsAndUpdates() {
     builder.addResources(ImmutableMap.of(Paths.get("barA"), FakeSourcePath.of("resA")), them);
     builder.addNativeLibraries(
         ImmutableMap.of(Paths.get("nativeA.so"), FakeSourcePath.of("nativeA")), them);
-    builder.addPrebuiltLibraries(ImmutableSet.of(FakeSourcePath.of("archiveA.whl")));
     builder.addModuleDirs(
         ImmutableSetMultimap.of(Paths.get(""), FakeSourcePath.of("extractedA.whl")));
 
     builder.addModule(Paths.get("fooB"), FakeSourcePath.of("sourceB"), them);
     builder.addResources(ImmutableMap.of(Paths.get("barB"), FakeSourcePath.of("resB")), them);
     builder.addNativeLibraries(
         ImmutableMap.of(Paths.get("nativeB.so"), FakeSourcePath.of("nativeB")), them);
-    builder.addPrebuiltLibraries(ImmutableSet.of(FakeSourcePath.of("archiveB.whl")));
     builder.addModuleDirs(
         ImmutableSetMultimap.of(Paths.get(""), FakeSourcePath.of("extractedB.whl")));
 

test/com/facebook/buck/python/PythonPackagedBinaryTest.java

@@ -45,7 +45,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -98,7 +97,6 @@ private RuleKey getRuleKeyForModuleLayout(
                     Paths.get(mod2), PathSourcePath.of(projectFilesystem, src2)),
                 ImmutableMap.of(),
                 ImmutableMap.of(),
-                ImmutableSet.of(),
                 ImmutableMultimap.of(),
                 Optional.empty()),
             ImmutableSortedSet.of(),