Merge 8969016 into 43ebd34

pantsbuild · Jul 23, 2020 · f13a9c0 · f13a9c0
2 parents 43ebd34 + 8969016
commit f13a9c0
Showing 1 changed file with 5 additions and 28 deletions.
diff --git a/src/python/pants/backend/codegen/protobuf/protoc.py b/src/python/pants/backend/codegen/protobuf/protoc.py
@@ -3,9 +3,10 @@
 
 from typing import List, cast
 
-from pants.core.util_rules.external_tool import ExternalTool, ExternalToolError
+from pants.core.util_rules.external_tool import ExternalTool
 from pants.engine.platform import Platform
 from pants.option.custom_types import target_option
+from pants.util.enums import match
 
 
 class Protoc(ExternalTool):
@@ -14,8 +15,6 @@ class Protoc(ExternalTool):
     options_scope = "protoc"
     default_version = "3.11.4"
     default_known_versions = [
-        "2.4.1|darwin|d7bb59a067e6f5321499e6be4f6f6d5862693274e12d0cb9405596a34ba13d67|1953956",
-        "2.4.1|linux |917d3b142da371ba466f2c853429815d1874bc77fc7d24cf65c82cf3718ef857|18589557",
         "3.11.4|darwin|8c6af11e1058efe953830ecb38324c0e0fd2fb67df3891896d138c535932e7db|2482119",
         "3.11.4|linux |6d0f18cd84b918c7b3edd0203e75569e0c8caecb1367bbbe409b45e28514f5be|1591191",
     ]
@@ -37,37 +36,15 @@ def register_options(cls, register):
         )
 
     def generate_url(self, plat: Platform) -> str:
-        version = self.get_options().version
-        if version in {"2.4.1", "2.5.0", "2.6.1"}:
-            # Very old versions of protoc don't have binaries available in their github releases.
-            # So for now we rely on the pants-hosted binaries.
-            # TODO: Get rid of or update our tests that rely on this very old version.
-            #  Then we can consider whether to stop supporting it.
-            if plat == Platform.darwin:
-                plat_str = "mac/10.13"
-            elif plat == Platform.linux:
-                plat_str = "linux/x86_64"
-            else:
-                raise ExternalToolError()
-            return f"https://binaries.pantsbuild.org/bin/protoc/{plat_str}/{version}/protoc"
-
-        if plat == Platform.darwin:
-            plat_str = "osx"
-        elif plat == Platform.linux:
-            plat_str = "linux"
-        else:
-            raise ExternalToolError()
+        version = self.options.version
+        plat_str = match(plat, {Platform.darwin: "osx", Platform.linux: "linux"})
         return (
             f"https://github.com/protocolbuffers/protobuf/releases/download/"
             f"v{version}/protoc-{version}-{plat_str}-x86_64.zip"
         )
 
     def generate_exe(self, plat: Platform) -> str:
-        version = self.get_options().version
-        if version in {"2.4.1", "2.5.0", "2.6.1"}:
-            return "protoc"
-        else:
-            return "bin/protoc"
+        return "bin/protoc"
 
     @property
     def runtime_targets(self) -> List[str]: