clean up pyre-fixmes

Summary:
The bulk of these were enum annotation issues from the quality insights dashboard.

There were also pyre errors caused by shadowing/redeclaring variables, which came up in the discussion re: Pyrefly and Pytorch.

The enum issues are fixed via codemod, by running

```
buck2 run fbcode//tools/pyre/facebook/tools/codemods:codemods -- enum_annotations <file name>
```

Reviewed By: stroxler

Differential Revision: D74484869

fbshipit-source-id: dedea875173cd2dcdbab8c90ab6d16e3234776d5

Author: yangdanny97

client/command_arguments.py

@@ -38,20 +38,14 @@
 
 
 class ProfileOutput(enum.Enum):
-    # pyre-fixme[35]: Target cannot be annotated.
-    TRACE_EVENT: str = "trace_event"
-    # pyre-fixme[35]: Target cannot be annotated.
-    COLD_START_PHASES: str = "cold_start_phases"
-    # pyre-fixme[35]: Target cannot be annotated.
-    INCREMENTAL_UPDATES: str = "incremental_updates"
-    # pyre-fixme[35]: Target cannot be annotated.
-    TAINT: str = "taint"
-    # pyre-fixme[35]: Target cannot be annotated.
-    INDIVIDUAL_TABLE_SIZES: str = "individual_table_sizes"
-    # pyre-fixme[35]: Target cannot be annotated.
-    TOTAL_SHARED_MEMORY_SIZE_OVER_TIME: str = "total_shared_memory_size_over_time"
-    # pyre-fixme[35]: Target cannot be annotated.
-    TOTAL_SHARED_MEMORY_SIZE_OVER_TIME_GRAPH: str = (
+    _value_: str
+    TRACE_EVENT = "trace_event"
+    COLD_START_PHASES = "cold_start_phases"
+    INCREMENTAL_UPDATES = "incremental_updates"
+    TAINT = "taint"
+    INDIVIDUAL_TABLE_SIZES = "individual_table_sizes"
+    TOTAL_SHARED_MEMORY_SIZE_OVER_TIME = "total_shared_memory_size_over_time"
+    TOTAL_SHARED_MEMORY_SIZE_OVER_TIME_GRAPH = (
         "total_shared_memory_size_over_time_graph"  # noqa B950
     )
 
@@ -60,26 +54,22 @@ def __str__(self) -> str:
 
 
 class VersionKind(str, enum.Enum):
-    # pyre-fixme[35]: Target cannot be annotated.
-    NONE: str = "none"
-    # pyre-fixme[35]: Target cannot be annotated.
-    CLIENT: str = "client"
-    # pyre-fixme[35]: Target cannot be annotated.
-    CLIENT_AND_BINARY: str = "client_and_binary"
+    _value_: str
+    NONE = "none"
+    CLIENT = "client"
+    CLIENT_AND_BINARY = "client_and_binary"
 
 
 class MissingFlowsKind(str, enum.Enum):
-    # pyre-fixme[35]: Target cannot be annotated.
-    OBSCURE: str = "obscure"
-    # pyre-fixme[35]: Target cannot be annotated.
-    TYPE: str = "type"
+    _value_: str
+    OBSCURE = "obscure"
+    TYPE = "type"
 
 
 class TaintOutputFormat(str, enum.Enum):
-    # pyre-fixme[35]: Target cannot be annotated.
-    JSON: str = "json"
-    # pyre-fixme[35]: Target cannot be annotated.
-    SHARDED_JSON: str = "sharded-json"
+    _value_: str
+    JSON = "json"
+    SHARDED_JSON = "sharded-json"
 
 
 @dataclass(frozen=True)

client/commands/incremental.py

@@ -48,10 +48,9 @@ class InvalidServerResponse(Exception):
 
 
 class ServerStatus(str, enum.Enum):
-    # pyre-fixme[35]: Target cannot be annotated.
-    NEWLY_STARTED: str = "newly_started_server"
-    # pyre-fixme[35]: Target cannot be annotated.
-    ALREADY_RUNNING: str = "already_running_server"
+    _value_: str
+    NEWLY_STARTED = "newly_started_server"
+    ALREADY_RUNNING = "already_running_server"
 
     def __str__(self) -> str:
         return self.value

client/configuration/site_packages.py

@@ -29,12 +29,10 @@
 
 
 class SearchStrategy(str, enum.Enum):
-    # pyre-fixme[35]: Target cannot be annotated.
-    NONE: str = "none"
-    # pyre-fixme[35]: Target cannot be annotated.
-    ALL: str = "all"
-    # pyre-fixme[35]: Target cannot be annotated.
-    PEP561: str = "pep561"
+    _value_: str
+    NONE = "none"
+    ALL = "all"
+    PEP561 = "pep561"
 
     def __str__(self) -> str:
         return self.value
@@ -48,12 +46,10 @@ def from_string(input: str) -> "Optional[SearchStrategy]":
 
 
 class PackageStatus(enum.IntEnum):
-    # pyre-fixme[35]: Target cannot be annotated.
-    UNTYPED: int = 0
-    # pyre-fixme[35]: Target cannot be annotated.
-    PARTIALLY_TYPED: int = 1
-    # pyre-fixme[35]: Target cannot be annotated.
-    TYPED: int = 2
+    _value_: int
+    UNTYPED = 0
+    PARTIALLY_TYPED = 1
+    TYPED = 2
 
 
 @dataclasses.dataclass(frozen=True)

client/dataclasses_merge.py

@@ -103,12 +103,10 @@ class Baz:
 
 
 class Policy(str, enum.Enum):
-    # pyre-fixme[35]: Target cannot be annotated.
-    OVERWRITE: str = "overwrite"
-    # pyre-fixme[35]: Target cannot be annotated.
-    PREPEND: str = "prepend"
-    # pyre-fixme[35]: Target cannot be annotated.
-    RAISE_WHEN_OVERWRITTEN: str = "raise_when_overwritten"
+    _value_: str
+    OVERWRITE = "overwrite"
+    PREPEND = "prepend"
+    RAISE_WHEN_OVERWRITTEN = "raise_when_overwritten"
 
 
 class DataclassMergeError(Exception):

scripts/pypi/build_pypi_package.py

@@ -278,7 +278,6 @@ def _run_setup_command(
         package_name="pyre-check-nightly" if nightly else "pyre-check",
         package_version=version,
         module_name=MODULE_NAME,
-        # pyre-fixme[6]: Expected `List[str]` for 4th param but got `Sequence[str]`.
         runtime_dependencies=dependencies,
         long_description=long_description,
         script_name="setup.py",

scripts/pypi/setup.py

@@ -14,7 +14,7 @@
 import os
 import sys
 from pathlib import Path
-from typing import List, Tuple
+from typing import List, Sequence, Tuple
 
 from setuptools import find_packages, setup
 
@@ -77,7 +77,7 @@ def run(
     package_name: str,
     package_version: str,
     module_name: str,
-    runtime_dependencies: List[str],
+    runtime_dependencies: Sequence[str],
     long_description: str,
     **kwargs: object,
 ) -> None:

tools/generate_taint_models/decorator_parser.py

@@ -90,8 +90,7 @@ def _parse_decorator(
             argument.s for argument in decorator.args if isinstance(argument, ast.Str)
         }
         decorator_keywords = {
-            # pyre-fixme[22]: The cast is redundant.
-            (keyword.arg, cast(ast.Str, keyword.value).s)
+            (keyword.arg, keyword.value.s)
             for keyword in decorator.keywords
             if isinstance(keyword.value, ast.Str)
         }

tools/typeshed_patcher/patch_specs.py

@@ -62,10 +62,9 @@ def is_empty(self) -> bool:
 
 
 class AddPosition(str, enum.Enum):
-    # pyre-fixme[35]: Target cannot be annotated.
-    TOP_OF_SCOPE: str = "top"
-    # pyre-fixme[35]: Target cannot be annotated.
-    BOTTOM_OF_SCOPE: str = "bottom"
+    _value_: str
+    TOP_OF_SCOPE = "top"
+    BOTTOM_OF_SCOPE = "bottom"
 
     @staticmethod
     def from_json(input_object: object) -> "AddPosition":

tools/upgrade/commands/codemods.py

@@ -55,15 +55,16 @@ def add_arguments(cls, parser: argparse.ArgumentParser) -> None:
     @override
     def run(self) -> None:
         errors = Errors.from_stdin(self._only_fix_error_code)
-        # pyre-fixme[16]: `List` has no attribute `paths_to_errors`.
-        for path, errors in errors.paths_to_errors.items():
+        for path, errors_for_path in errors.paths_to_errors.items():
             LOG.info("Patching errors in `%s`.", path)
-            errors = sorted(errors, key=lambda error: error["line"], reverse=True)
+            errors_for_path = sorted(
+                errors_for_path, key=lambda error: error["line"], reverse=True
+            )
 
             path = pathlib.Path(path)
             lines = path.read_text().split("\n")
 
-            for error in errors:
+            for error in errors_for_path:
                 if error["code"] != 15:
                     continue
                 line = error["line"] - 1
@@ -114,15 +115,16 @@ def add_arguments(cls, parser: argparse.ArgumentParser) -> None:
     @override
     def run(self) -> None:
         errors = Errors.from_stdin(self._only_fix_error_code)
-        # pyre-fixme[16]: `List` has no attribute `paths_to_errors`.
-        for path, errors in errors.paths_to_errors.items():
+        for path, errors_for_path in errors.paths_to_errors.items():
             LOG.info("Patching errors in `%s`", path)
-            errors = sorted(errors, key=lambda error: error["line"], reverse=True)
+            errors_for_path = sorted(
+                errors_for_path, key=lambda error: error["line"], reverse=True
+            )
 
             path = pathlib.Path(path)
             lines = path.read_text().split("\n")
 
-            for error in errors:
+            for error in errors_for_path:
                 if error["code"] != 5:
                     continue
 

tools/upgrade/commands/targets_to_configuration.py

@@ -186,14 +186,10 @@ def find_or_create_configuration(
 
     def collect_full_targets(self, targets: Dict[str, List[Target]]) -> List[str]:
         new_targets = []
-        # pyre-fixme[9]: targets has type `Dict[str, List[Target]]`; used as
-        #  `List[Target]`.
-        for path, targets in targets.items():
+        for path, targets_for_path in targets.items():
             new_targets += [
-                # pyre-fixme[16]: `str` has no attribute `name`.
                 "//" + path.replace("/TARGETS", "") + ":" + target.name
-                for target in targets
-                # pyre-fixme[16]: `str` has no attribute `check_types`.
+                for target in targets_for_path
                 if target.check_types
             ]
         return new_targets