fix mypy issues

regro · Nov 25, 2024 · 1ad999f · 1ad999f
1 parent d0a4214
commit 1ad999f
Show file tree

Hide file tree

Showing 27 changed files with 312 additions and 177 deletions.
diff --git a/conda-lock.yml b/conda-lock.yml
@@ -3,9 +3,9 @@ metadata:
     - url: conda-forge
       used_env_vars: []
   content_hash:
-    linux-64: 47e27eadf78b024984ba2246127d65e7524c60bcb407b978498c1135cec23162
-    osx-64: 5e63598ecaacbfd5f9f0e91975968b3d3bc12fae95d5cee457dd9b23b569ac98
-    osx-arm64: 0f204f64b92bd922585ecf919b03561a9dccf5481b70ff29f89ea97b40c8ffb8
+    linux-64: 4e740f8af6de809a90d97ae11e9665ea4057e2b62f165ae5425e72178f3c7659
+    osx-64: 52e22739c47ecf742d0e09cb3959ecaecbdffd18c089951fb20d642bfb8d154f
+    osx-arm64: d685097d2634b4be5015607c52d7a2b23b3eb609a18ba28962c6b7250db1f760
   platforms:
     - osx-arm64
     - linux-64
@@ -8583,6 +8583,99 @@ package:
     platform: osx-arm64
     url: https://conda.anaconda.org/conda-forge/noarch/msrest-0.6.21-pyh44b312d_0.tar.bz2
     version: 0.6.21
+  - category: main
+    dependencies:
+      __glibc: '>=2.17,<3.0.a0'
+      libgcc: '>=13'
+      mypy_extensions: '>=1.0.0'
+      psutil: '>=4.0'
+      python: '>=3.11,<3.12.0a0'
+      python_abi: 3.11.*
+      typing_extensions: '>=4.1.0'
+    hash:
+      md5: 0111eaad55bea1e607d90d4f84089f74
+      sha256: 460f3eb43160dc9e9a1f2aeabdf8cd809aefcf776c33ffd155f9bd2420a005c5
+    manager: conda
+    name: mypy
+    optional: false
+    platform: linux-64
+    url:
+      https://conda.anaconda.org/conda-forge/linux-64/mypy-1.13.0-py311h9ecbd09_0.conda
+    version: 1.13.0
+  - category: main
+    dependencies:
+      __osx: '>=10.13'
+      mypy_extensions: '>=1.0.0'
+      psutil: '>=4.0'
+      python: '>=3.11,<3.12.0a0'
+      python_abi: 3.11.*
+      typing_extensions: '>=4.1.0'
+    hash:
+      md5: 83a6e2bb0ea4940434b4d1402c92d3c4
+      sha256: ddca5a4235df88b876769dc191a5a41a453d2983bcb56104c0821d252e1abbb4
+    manager: conda
+    name: mypy
+    optional: false
+    platform: osx-64
+    url: https://conda.anaconda.org/conda-forge/osx-64/mypy-1.13.0-py311h1314207_0.conda
+    version: 1.13.0
+  - category: main
+    dependencies:
+      __osx: '>=11.0'
+      mypy_extensions: '>=1.0.0'
+      psutil: '>=4.0'
+      python: '>=3.11,<3.12.0a0'
+      python_abi: 3.11.*
+      typing_extensions: '>=4.1.0'
+    hash:
+      md5: 8b3f3c83db062e4970ba7a04890c83d5
+      sha256: 23c4fec92c5926baf3fe6ca8c0ad8b3d8ada66786d5b697d6e641d8885ac8ac6
+    manager: conda
+    name: mypy
+    optional: false
+    platform: osx-arm64
+    url:
+      https://conda.anaconda.org/conda-forge/osx-arm64/mypy-1.13.0-py311hae2e1ce_0.conda
+    version: 1.13.0
+  - category: main
+    dependencies:
+      python: '>=3.5'
+    hash:
+      md5: 4eccaeba205f0aed9ac3a9ea58568ca3
+      sha256: f240217476e148e825420c6bc3a0c0efb08c0718b7042fae960400c02af858a3
+    manager: conda
+    name: mypy_extensions
+    optional: false
+    platform: linux-64
+    url:
+      https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda
+    version: 1.0.0
+  - category: main
+    dependencies:
+      python: '>=3.5'
+    hash:
+      md5: 4eccaeba205f0aed9ac3a9ea58568ca3
+      sha256: f240217476e148e825420c6bc3a0c0efb08c0718b7042fae960400c02af858a3
+    manager: conda
+    name: mypy_extensions
+    optional: false
+    platform: osx-64
+    url:
+      https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda
+    version: 1.0.0
+  - category: main
+    dependencies:
+      python: '>=3.5'
+    hash:
+      md5: 4eccaeba205f0aed9ac3a9ea58568ca3
+      sha256: f240217476e148e825420c6bc3a0c0efb08c0718b7042fae960400c02af858a3
+    manager: conda
+    name: mypy_extensions
+    optional: false
+    platform: osx-arm64
+    url:
+      https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda
+    version: 1.0.0
   - category: main
     dependencies:
       __glibc: '>=2.17,<3.0.a0'

diff --git a/conda_forge_tick/auto_tick.py b/conda_forge_tick/auto_tick.py
@@ -9,7 +9,7 @@
 import traceback
 import typing
 from dataclasses import dataclass
-from typing import Literal, cast
+from typing import Any, Literal, cast
 from urllib.error import URLError
 from uuid import uuid4
 
@@ -70,12 +70,15 @@
 )
 
 from .migrators_types import MigrationUidTypedDict
-from .models.pr_json import PullRequestData, PullRequestInfoSpecial, PullRequestState
+from .models.pr_json import (
+    PullRequestData,
+    PullRequestInfoSpecial,
+    PullRequestState,
+)
 
 logger = logging.getLogger(__name__)
 
 BOT_HOME_DIR: str = os.getcwd()
-START_TIME = None
 TIMEOUT = int(os.environ.get("TIMEOUT", 600))
 
 # migrator runs on loop so avoid any seeds at current time should that happen
@@ -424,9 +427,9 @@ def _check_and_process_solvability(
 
 def get_spoofed_closed_pr_info() -> PullRequestInfoSpecial:
     return PullRequestInfoSpecial(
-        id=str(uuid4()),
+        id=uuid4(),
         merged_at="never issued",
-        state="closed",
+        state=PullRequestState.CLOSED,
     )
 
 
@@ -437,7 +440,10 @@ def run_with_tmpdir(
     rerender: bool = True,
     base_branch: str = "main",
     **kwargs: typing.Any,
-) -> tuple[MigrationUidTypedDict, dict] | tuple[Literal[False], Literal[False]]:
+) -> (
+    tuple[MigrationUidTypedDict, LazyJson | Literal[False]]
+    | tuple[Literal[False], Literal[False]]
+):
     """
     For a given feedstock and migration run the migration in a temporary directory that will be deleted after the
     migration is complete.
@@ -465,7 +471,10 @@ def run(
     rerender: bool = True,
     base_branch: str = "main",
     **kwargs: typing.Any,
-) -> tuple[MigrationUidTypedDict, dict] | tuple[Literal[False], Literal[False]]:
+) -> (
+    tuple[MigrationUidTypedDict, LazyJson | Literal[False]]
+    | tuple[Literal[False], Literal[False]]
+):
     """For a given feedstock and migration run the migration
 
     Parameters
@@ -601,19 +610,25 @@ def run(
         and pr_data.state != PullRequestState.CLOSED
         and rerender_info.rerender_comment
     ):
+        if pr_data.number is None:
+            raise ValueError(
+                f"Unexpected GitHub API response: PR number is missing for PR ID {pr_data.id}."
+            )
         git_backend.comment_on_pull_request(
             repo_owner=context.git_repo_owner,
             repo_name=context.git_repo_name,
             pr_number=pr_data.number,
             comment=rerender_info.rerender_comment,
         )
 
+    pr_lazy_json: LazyJson | Literal[False]
     if pr_data:
-        pr_lazy_json = LazyJson(
+        pr_lazy_json_present = LazyJson(
             os.path.join("pr_json", f"{pr_data.id}.json"),
         )
-        with pr_lazy_json as __edit_pr_lazy_json:
+        with pr_lazy_json_present as __edit_pr_lazy_json:
             __edit_pr_lazy_json.update(**pr_data.model_dump(mode="json"))
+        pr_lazy_json = pr_lazy_json_present
     else:
         pr_lazy_json = False
 
@@ -624,7 +639,10 @@ def run(
         context.attrs, migrator_name, is_version=is_version_migration
     )
 
-    return migration_run_data["migrate_return_value"], pr_lazy_json
+    migrate_return_value: MigrationUidTypedDict = migration_run_data[
+        "migrate_return_value"
+    ]
+    return migrate_return_value, pr_lazy_json
 
 
 def _compute_time_per_migrator(migrators):
@@ -633,8 +651,8 @@ def _compute_time_per_migrator(migrators):
     for migrator in tqdm.tqdm(migrators, ncols=80, desc="computing time per migrator"):
         if isinstance(migrator, Version):
             _num_nodes = 0
-            for node_name in migrator.effective_graph.nodes:
-                with migrator.effective_graph.nodes[node_name]["payload"] as attrs:
+            for node_name in migrator.effective_graph.nodes:  # type: ignore[union-attr] # TODO: effective_graph can be None
+                with migrator.effective_graph.nodes[node_name]["payload"] as attrs:  # type: ignore[union-attr] # TODO: effective_graph can be None
                     with attrs["version_pr_info"] as vpri:
                         _attempts = vpri.get("new_version_attempts", {}).get(
                             vpri.get("new_version", ""),
@@ -644,7 +662,7 @@ def _compute_time_per_migrator(migrators):
                         _num_nodes += 1
             _num_nodes = max(
                 _num_nodes,
-                min(PR_LIMIT * 4, len(migrator.effective_graph.nodes)),
+                min(PR_LIMIT * 4, len(migrator.effective_graph.nodes)),  # type: ignore[union-attr] # TODO: effective_graph can be None
             )
             num_nodes.append(_num_nodes)
         else:
@@ -684,23 +702,6 @@ def _compute_time_per_migrator(migrators):
     return num_nodes, time_per_migrator, tot_time_per_migrator
 
 
-def _over_time_limit():
-    _now = time.time()
-    print(
-        """\
-
-=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>
-=~> elpased time %ds (timeout %ds)
-=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>=~>
-
-"""
-        % (_now - START_TIME, TIMEOUT),
-        flush=True,
-        end="",
-    )
-    return _now - START_TIME > TIMEOUT
-
-
 def _run_migrator_on_feedstock_branch(
     attrs,
     base_branch,
@@ -730,15 +731,15 @@ def _run_migrator_on_feedstock_branch(
         # if migration successful
         if migrator_uid:
             with attrs["pr_info"] as pri:
-                d = frozen_to_json_friendly(migrator_uid)
+                d: Any = frozen_to_json_friendly(migrator_uid)
                 # if we have the PR already do nothing
                 if d["data"] in [
                     existing_pr["data"] for existing_pr in pri.get("PRed", [])
                 ]:
                     pass
                 else:
                     if not pr_json:
-                        pr_json = {
+                        pr_json = {  # type: ignore[assignment] # TODO: incompatible with LazyJson
                             "state": "closed",
                             "head": {
                                 "ref": "<this_is_not_a_branch>",
@@ -847,15 +848,15 @@ def _run_migrator_on_feedstock_branch(
     return good_prs, break_loop
 
 
-def _is_migrator_done(_mg_start, good_prs, time_per, pr_limit):
+def _is_migrator_done(_mg_start, good_prs, time_per, pr_limit, start_time: float):
     curr_time = time.time()
     backend = github_backend()
     api_req = backend.get_api_requests_left()
 
-    if curr_time - START_TIME > TIMEOUT:
+    if curr_time - start_time > TIMEOUT:
         logger.info(
             "BOT TIMEOUT: breaking after %d seconds (limit %d)",
-            curr_time - START_TIME,
+            curr_time - start_time,
             TIMEOUT,
         )
         return True
@@ -885,7 +886,9 @@ def _is_migrator_done(_mg_start, good_prs, time_per, pr_limit):
     return False
 
 
-def _run_migrator(migrator, mctx, temp, time_per, git_backend: GitPlatformBackend):
+def _run_migrator(
+    migrator, mctx, temp, time_per, git_backend: GitPlatformBackend, start_time: float
+):
     _mg_start = time.time()
 
     migrator_name = get_migrator_name(migrator)
@@ -939,7 +942,9 @@ def _run_migrator(migrator, mctx, temp, time_per, git_backend: GitPlatformBacken
             flush=True,
         )
 
-        if _is_migrator_done(_mg_start, good_prs, time_per, migrator.pr_limit):
+        if _is_migrator_done(
+            _mg_start, good_prs, time_per, migrator.pr_limit, start_time
+        ):
             return 0
 
     for node_name in possible_nodes:
@@ -956,7 +961,9 @@ def _run_migrator(migrator, mctx, temp, time_per, git_backend: GitPlatformBacken
         ):
             # Don't let CI timeout, break ahead of the timeout so we make certain
             # to write to the repo
-            if _is_migrator_done(_mg_start, good_prs, time_per, migrator.pr_limit):
+            if _is_migrator_done(
+                _mg_start, good_prs, time_per, migrator.pr_limit, start_time
+            ):
                 break
 
             base_branches = migrator.get_possible_feedstock_branches(attrs)
@@ -1201,8 +1208,7 @@ def _update_graph_with_pr_info():
 
 
 def main(ctx: CliContext) -> None:
-    global START_TIME
-    START_TIME = time.time()
+    start_time = time.time()
 
     _setup_limits()
 
@@ -1260,7 +1266,12 @@ def main(ctx: CliContext) -> None:
 
     for mg_ind, migrator in enumerate(migrators):
         good_prs = _run_migrator(
-            migrator, mctx, temp, time_per_migrator[mg_ind], git_backend
+            migrator,
+            mctx,
+            temp,
+            time_per_migrator[mg_ind],
+            git_backend,
+            start_time=start_time,
         )
         if good_prs > 0:
             pass

diff --git a/conda_forge_tick/container_cli.py b/conda_forge_tick/container_cli.py
@@ -199,9 +199,11 @@ def _migrate_feedstock(*, feedstock_name, default_branch, attrs, input_kwargs):
     logger = logging.getLogger("conda_forge_tick.container")
 
     with tempfile.TemporaryDirectory() as tmpdir:
-        input_fs_dir = glob.glob("/cf_feedstock_ops_dir/*-feedstock")
-        assert len(input_fs_dir) == 1, f"expected one feedstock, got {input_fs_dir}"
-        input_fs_dir = input_fs_dir[0]
+        input_fs_dir_list = glob.glob("/cf_feedstock_ops_dir/*-feedstock")
+        assert (
+            len(input_fs_dir_list) == 1
+        ), f"expected one feedstock, got {input_fs_dir_list}"
+        input_fs_dir = input_fs_dir_list[0]
         logger.debug(
             f"input container feedstock dir {input_fs_dir}: {os.listdir(input_fs_dir)}"
         )
@@ -253,9 +255,11 @@ def _update_version(*, version, hash_type):
     logger = logging.getLogger("conda_forge_tick.container")
 
     with tempfile.TemporaryDirectory() as tmpdir:
-        input_fs_dir = glob.glob("/cf_feedstock_ops_dir/*-feedstock")
-        assert len(input_fs_dir) == 1, f"expected one feedstock, got {input_fs_dir}"
-        input_fs_dir = input_fs_dir[0]
+        input_fs_dir_list = glob.glob("/cf_feedstock_ops_dir/*-feedstock")
+        assert (
+            len(input_fs_dir_list) == 1
+        ), f"expected one feedstock, got {input_fs_dir_list}"
+        input_fs_dir = input_fs_dir_list[0]
         logger.debug(
             f"input container feedstock dir {input_fs_dir}: {os.listdir(input_fs_dir)}"
         )
@@ -472,12 +476,14 @@ def parse_meta_yaml(
     "--cbc-path", type=str, default=None, help="The path to global pinning file."
 )
 def parse_recipe_yaml(
+    log_level,
     for_pinning,
     platform_arch,
     cbc_path,
 ):
     return _run_bot_task(
         _parse_recipe_yaml,
+        log_level=log_level,
         existing_feedstock_node_attrs=None,
         for_pinning=for_pinning,
         platform_arch=platform_arch,