fix: update python syntax and fix bugs for src updates (#5844)

Author: beckermr

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
     hooks:
       - id: pyupgrade
         args:
-          - --py36-plus
+          - --py312-plus
 
   - repo: https://github.com/adhtruong/mirrors-typos
     rev: v1.44.0

conda_forge_tick/all_feedstocks.py

@@ -1,5 +1,4 @@
 import logging
-from typing import List
 
 import tqdm
 
@@ -41,7 +40,7 @@ def get_all_feedstocks_from_github():
     }
 
 
-def get_all_feedstocks(cached: bool = False) -> List[str]:
+def get_all_feedstocks(cached: bool = False) -> list[str]:
     if cached:
         logger.info("reading cached feedstocks")
         with open("all_feedstocks.json") as f:
@@ -52,7 +51,7 @@ def get_all_feedstocks(cached: bool = False) -> List[str]:
     return names
 
 
-def get_archived_feedstocks(cached: bool = False) -> List[str]:
+def get_archived_feedstocks(cached: bool = False) -> list[str]:
     if cached:
         logger.info("reading cached archived feedstocks")
         with open("all_feedstocks.json") as f:

conda_forge_tick/cli.py

@@ -1,6 +1,5 @@
 import logging
 import time
-from typing import Optional
 
 import click
 from click import Context, IntRange
@@ -150,7 +149,7 @@ def make_graph(
 )
 @pass_context
 def update_upstream_versions(
-    ctx: CliContext, job: int, n_jobs: int, package: Optional[str]
+    ctx: CliContext, job: int, n_jobs: int, package: str | None
 ) -> None:
     """
     Update the upstream versions of feedstocks in the graph.

conda_forge_tick/config_schema.py

@@ -2,7 +2,6 @@
 from enum import StrEnum
 from inspect import cleandoc
 from pathlib import Path
-from typing import Optional, Union
 
 from pydantic import BaseModel, ConfigDict, Field
 
@@ -46,14 +45,14 @@ class BotConfigVersionUpdatesNVIDIA(BaseModel):
     updates using the NVIDIA source.
     """
 
-    compute_subdir: Optional[str] = Field(
+    compute_subdir: str | None = Field(
         default=None,
         description="For sources from `developer.download.nvidia.com/compute`, this string"
         "defines the subdirectory in which to find the JSON blob containing metadata"
         "about the latest releases of a package.",
     )
 
-    json_name: Optional[str] = Field(
+    json_name: str | None = Field(
         default=None,
         description="For sources from `developer.download.nvidia.com/compute`, this string"
         "defines the name of the package in the JSON blob containing metadata"
@@ -69,18 +68,18 @@ class BotConfigVersionUpdates(BaseModel):
 
     model_config: ConfigDict = ConfigDict(extra="forbid")
 
-    random_fraction_to_keep: Optional[float] = Field(
+    random_fraction_to_keep: float | None = Field(
         None,
         description="Fraction of versions to keep for frequently updated packages",
     )
 
-    exclude: Optional[list[str]] = Field(
+    exclude: list[str] | None = Field(
         default=[],
         description="List of versions to exclude. "
         "Make sure branch names are `str` by quoting the value.",
     )
 
-    sources: Optional[list[BotConfigVersionUpdatesSourcesChoice]] = Field(
+    sources: list[BotConfigVersionUpdatesSourcesChoice] | None = Field(
         None,
         description=cleandoc(
             """
@@ -111,35 +110,35 @@ class BotConfigVersionUpdates(BaseModel):
         ),
     )
 
-    skip: Optional[bool] = Field(
+    skip: bool | None = Field(
         default=False,
         description="Skip automatic version updates. "
         "Useful in cases where the source project's version numbers don't conform to "
         "PEP440.",
     )
 
-    even_odd_versions: Optional[bool] = Field(
+    even_odd_versions: bool | None = Field(
         default=None,
         description="For projects that follow even/odd versioning schemes (like GNOME), "
         "set to true to only accept stable versions (even minor numbers: 1.2.x, 1.4.x) "
         "and ignore development versions (odd minor numbers: 1.1.x, 1.3.x). "
         "Leave unset for projects that don't follow this versioning scheme.",
     )
 
-    allowed_tag_globs: Optional[Union[str, list[str]]] = Field(
+    allowed_tag_globs: str | list[str] | None = Field(
         default=None,
         description="For version sources that parse repo/vcs tags (e.g., "
         "`gittags`, `github`, `githubreleases`), "
         "the list of glob patterns that define which tags are allowed. This field can be used to "
         "filter the set of tags to only those relevant for the feedstock.",
     )
 
-    nvidia: Optional[BotConfigVersionUpdatesNVIDIA] = Field(
+    nvidia: BotConfigVersionUpdatesNVIDIA | None = Field(
         default_factory=BotConfigVersionUpdatesNVIDIA,
         description="Bot config for version update PRs using the NVIDIA updater.",
     )
 
-    use_curl: Optional[bool] = Field(
+    use_curl: bool | None = Field(
         None,
         description="If True, use `curl` to test if URLs exist, otherwise use `wget`.",
     )
@@ -199,38 +198,38 @@ class BotConfig(BaseModel):
 
     model_config: ConfigDict = ConfigDict(extra="forbid")
 
-    automerge: Optional[Union[bool, BotConfigAutoMergeChoice]] = Field(
+    automerge: bool | BotConfigAutoMergeChoice | None = Field(
         False,
         description="Automatically merge PRs if possible",
     )
 
-    check_solvable: Optional[bool] = Field(
+    check_solvable: bool | None = Field(
         default=True,
         description="Open PRs only if resulting environment is solvable.",
     )
 
-    inspection: Optional[BotConfigInspectionChoice] = Field(
+    inspection: BotConfigInspectionChoice | None = Field(
         default="hint",
         description="Method for generating hints or updating recipe",
     )
 
-    abi_migration_branches: Optional[list[str]] = Field(
+    abi_migration_branches: list[str] | None = Field(
         default=[],
         description="List of branches for additional bot migration PRs. "
         "Make sure branch names are `str` by quoting the value.",
     )
 
-    run_deps_from_wheel: Optional[bool] = Field(
+    run_deps_from_wheel: bool | None = Field(
         default=False,
         description="Update run dependencies from the pip wheel",
     )
 
-    version_updates: Optional[BotConfigVersionUpdates] = Field(
+    version_updates: BotConfigVersionUpdates | None = Field(
         default_factory=BotConfigVersionUpdates,
         description="Bot config for version update PRs",
     )
 
-    update_static_libs: Optional[bool] = Field(
+    update_static_libs: bool | None = Field(
         default=False,
         description="Update packages in `host` that are used for static "
         "linking. For bot to issue update PRs, you must have both an "
@@ -241,7 +240,7 @@ class BotConfig(BaseModel):
         "latest package.",
     )
 
-    remake_prs_with_conflicts: Optional[bool] = Field(
+    remake_prs_with_conflicts: bool | None = Field(
         default=True,
         description="Automatically remake untouched bot PRs with conflicts.",
     )

conda_forge_tick/feedstock_parser.py

@@ -9,7 +9,7 @@
 import zipfile
 from collections import defaultdict
 from pathlib import Path
-from typing import Optional, Set, Tuple, Union
+from typing import Union
 
 import requests
 import yaml
@@ -87,7 +87,7 @@ def _get_requirements(
     build: bool = True,
     host: bool = True,
     run: bool = True,
-    outputs_to_keep: Optional[Set["PackageName"]] = None,
+    outputs_to_keep: set["PackageName"] | None = None,
 ) -> set[PackageName]:
     """Get the list of recipe requirements from a meta.yaml dict.
 
@@ -124,7 +124,7 @@ def _get_requirements(
 
 
 def _parse_requirements(
-    req: Union[None, typing.List[str], "RequirementsTypedDict"],
+    req: Union[None, list[str], "RequirementsTypedDict"],
     build: bool = True,
     host: bool = True,
     run: bool = True,
@@ -541,7 +541,7 @@ def populate_feedstock_attributes(
     source = yaml_dict.get("source", [])
     if isinstance(source, collections.abc.Mapping):
         source = [source]
-    source_keys: Set[str] = set()
+    source_keys: set[str] = set()
     for s in source:
         if not node_attrs.get("url"):
             node_attrs["url"] = s.get("url")
@@ -556,7 +556,7 @@ def populate_feedstock_attributes(
 
 def _get_feedstock_commit_hash_and_timestamp(
     name: str,
-) -> Tuple[str | None, int | None]:
+) -> tuple[str | None, int | None]:
     git_url = f"https://github.com/{settings().conda_forge_org}/{name}-feedstock"
     with tempfile.TemporaryDirectory() as tmpdir, pushd(tmpdir):
         try:

conda_forge_tick/git_utils.py

@@ -11,12 +11,11 @@
 import threading
 import time
 from abc import ABC, abstractmethod
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from datetime import datetime
 from email import utils
 from functools import cached_property
 from pathlib import Path
-from typing import Dict, Iterator, Optional, Union
 
 import backoff
 import dateutil.parser
@@ -1551,9 +1550,9 @@ def delete_branch(pr_json: LazyJson | dict, dry_run: bool = False) -> None:
 
 
 def trim_pr_json_keys(
-    pr_json: Union[Dict, LazyJson],
-    src_pr_json: Optional[Union[Dict, LazyJson]] = None,
-) -> Union[Dict, LazyJson]:
+    pr_json: dict | LazyJson,
+    src_pr_json: dict | LazyJson | None = None,
+) -> dict | LazyJson:
     """Trim the set of keys in the PR json. The keys kept are defined by the global
     PR_KEYS_TO_KEEP.
 
@@ -1591,8 +1590,8 @@ def _munge_dict(dest, src, keys):
 
 
 def lazy_update_pr_json(
-    pr_json: Union[Dict, LazyJson], force: bool = False
-) -> Union[Dict, LazyJson]:
+    pr_json: dict | LazyJson, force: bool = False
+) -> dict | LazyJson:
     """Lazily update a GitHub PR.
 
     This function will use the Last-Modified field in the GitHub API to update
@@ -1663,7 +1662,7 @@ def lazy_update_pr_json(
 def refresh_pr(
     pr_json: LazyJson | dict,
     dry_run: bool = False,
-) -> Optional[dict]:
+) -> dict | None:
     from conda_forge_tick.settings import settings
 
     pr_refresh_age_days = settings().pr_refresh_age_days
@@ -1711,7 +1710,7 @@ def refresh_pr(
 
 
 def get_pr_obj_from_pr_json(
-    pr_json: Union[Dict, LazyJson],
+    pr_json: dict | LazyJson,
     gh: github3.GitHub,
 ) -> github3.pulls.PullRequest:
     """Produce a github3 pull request object from pr_json.
@@ -1741,7 +1740,7 @@ def get_pr_obj_from_pr_json(
 def close_out_labels(
     pr_json: LazyJson | dict,
     dry_run: bool = False,
-) -> Optional[dict]:
+) -> dict | None:
     # run this twice so we always have the latest info (eg a thing was already closed)
     if pr_json["state"] != "closed" and "bot-rerun" in [
         lab["name"] for lab in pr_json.get("labels", [])
@@ -1782,7 +1781,7 @@ def close_out_labels(
 def close_out_dirty_prs(
     pr_json: LazyJson | dict,
     dry_run: bool = False,
-) -> Optional[dict]:
+) -> dict | None:
     # run this twice so we always have the latest info (eg a thing was already closed)
     if pr_json["state"] != "closed" and pr_json["mergeable_state"] == "dirty":
         # update

conda_forge_tick/import_to_pkg.py

@@ -7,7 +7,6 @@
 from concurrent.futures import ProcessPoolExecutor, as_completed
 from functools import lru_cache
 from itertools import chain, groupby
-from typing import List
 
 import orjson
 import requests
@@ -283,7 +282,7 @@ def _get_imports_and_files(file):
     if data is None:
         return set(), []
 
-    pkg_files: List[str] = _extract_importable_files(data.get("files", []))
+    pkg_files: list[str] = _extract_importable_files(data.get("files", []))
     # TODO: handle top level things that are stand alone .py files
     return (
         {

conda_forge_tick/lazy_json_backends.py

@@ -12,15 +12,18 @@
 import time
 import urllib
 from abc import ABC, abstractmethod
-from collections.abc import Callable, Collection, MutableMapping
-from typing import (
-    IO,
-    Any,
+from collections.abc import (
+    Callable,
+    Collection,
     Iterable,
     Iterator,
     Mapping,
+    MutableMapping,
+)
+from typing import (
+    IO,
+    Any,
     Self,
-    Set,
 )
 
 import github
@@ -1176,7 +1179,7 @@ def default(obj: Any) -> Any:
     """
     if isinstance(obj, LazyJson):
         return obj.json_ref
-    elif isinstance(obj, Set):
+    elif isinstance(obj, set):
         return {"__set__": True, "elements": sorted(obj)}
     elif isinstance(obj, nx.DiGraph):
         nld = nx.node_link_data(obj, edges="links")

conda_forge_tick/lazy_json_backups.py

@@ -23,7 +23,7 @@
 
 
 def make_lazy_json_backup(verbose=False):
-    ts = str(int(datetime.datetime.now(tz=datetime.timezone.utc).timestamp()))
+    ts = str(int(datetime.datetime.now(tz=datetime.UTC).timestamp()))
     slink = f"cf_graph_{ts}"
     try:
         subprocess.run(
@@ -85,11 +85,11 @@ def prune_timestamps(
     one_week = datetime.timedelta(weeks=1)
     one_month = datetime.timedelta(weeks=4)
 
-    now = datetime.datetime.now(tz=datetime.timezone.utc)
+    now = datetime.datetime.now(tz=datetime.UTC)
 
     tot = 0
     for ts in sorted(timestamps)[::-1]:
-        dt = datetime.datetime.fromtimestamp(int(ts), tz=datetime.timezone.utc)
+        dt = datetime.datetime.fromtimestamp(int(ts), tz=datetime.UTC)
         for i in range(nhours):
             key = f"h{i}"
             dt_high = now - i * one_hour