feat: use extra prep step for easier deploys (#5421)

Author: beckermr

.github/workflows/bot-bot.yml

@@ -65,7 +65,10 @@ jobs:
 
           pushd cf-graph
 
+          conda-forge-tick prep-auto-tick
+          conda-forge-tick deploy-to-github --dirs-to-deploy=pr_json,version_pr_info,pr_info
           conda-forge-tick auto-tick
+
         env:
           BOT_TOKEN: ${{ secrets.AUTOTICK_BOT_TOKEN }}
           RUN_ID: ${{ github.run_id }}

conda_forge_tick/auto_tick.py

@@ -25,7 +25,6 @@
     FeedstockContext,
     MigratorSessionContext,
 )
-from conda_forge_tick.deploy import deploy
 from conda_forge_tick.feedstock_parser import BOOTSTRAP_MAPPINGS
 from conda_forge_tick.git_utils import (
     DryRunBackend,
@@ -1340,19 +1339,17 @@ def _update_graph_with_pr_info():
     dump_graph(gx)
 
 
-def main(ctx: CliContext) -> None:
-    start_time = time.time()
-
+def main_prep(ctx: CliContext) -> None:
     _setup_limits()
 
     with fold_log_lines("updating graph with PR info"):
         _update_graph_with_pr_info()
-        gc.collect()
-        deploy(
-            dry_run=ctx.dry_run,
-            dirs_to_deploy=["version_pr_info", "pr_json", "pr_info"],
-            git_only=False,
-        )
+
+
+def main(ctx: CliContext) -> None:
+    start_time = time.time()
+
+    _setup_limits()
 
     # record tmp dir so we can be sure to clean it later
     temp = glob.glob("/tmp/*")

conda_forge_tick/cli.py

@@ -159,6 +159,14 @@ def update_upstream_versions(
     update_upstream_versions.main(ctx, job=job, n_jobs=n_jobs, package=package)
 
 
+@main.command(name="prep-auto-tick")
+@pass_context
+def prep_auto_tick(ctx: CliContext) -> None:
+    from . import auto_tick
+
+    auto_tick.main_prep(ctx)
+
+
 @main.command(name="auto-tick")
 @pass_context
 def auto_tick(ctx: CliContext) -> None:
@@ -218,14 +226,25 @@ def make_mappings() -> None:
         "not be deployed."
     ),
 )
+@click.option(
+    "--dirs-to-deploy",
+    default=None,
+    help=(
+        "Comma-separated list of directories to deplot. If given, all other "
+        "directories will be ignored."
+    ),
+)
 @pass_context
-def deploy_to_github(ctx: CliContext, git_only: bool, dirs_to_ignore: str) -> None:
+def deploy_to_github(
+    ctx: CliContext, git_only: bool, dirs_to_ignore: str, dirs_to_deploy: str
+) -> None:
     from . import deploy
 
     deploy.deploy(
         dry_run=ctx.dry_run,
         git_only=git_only,
         dirs_to_ignore=[] if dirs_to_ignore is None else dirs_to_ignore.split(","),
+        dirs_to_deploy=[] if dirs_to_deploy is None else dirs_to_deploy.split(","),
     )
 
 

conda_forge_tick/deploy.py

@@ -291,7 +291,7 @@ def deploy(
         clean_disk_space()
 
     files_to_add: set[str] = set()
-    if dirs_to_deploy is None:
+    if not dirs_to_deploy:
         drs_to_deploy = [
             "status",
             "mappings",
@@ -304,7 +304,7 @@ def deploy(
             drs_to_deploy += CF_TICK_GRAPH_DATA_HASHMAPS
             drs_to_deploy += ["graph.json"]
     else:
-        if dirs_to_ignore is not None:
+        if dirs_to_ignore:
             raise RuntimeError(
                 "You cannot specify both `dirs_to_deploy` "
                 "and `dirs_to_ignore` when deploying the graph!"
@@ -344,7 +344,7 @@ def deploy(
 
     files_to_delete = _get_files_to_delete()
 
-    if dirs_to_ignore is not None:
+    if dirs_to_ignore:
         print("ignoring dirs:", dirs_to_ignore, flush=True)
         new_files_to_add = set()
         for fn in files_to_add:

conda_forge_tick/migrators/migration_yaml.py

@@ -434,7 +434,8 @@ def migrate(
                 cbc_contents = f.read()
             merged_cbc = merge_migrator_cbc(self.yaml_contents, cbc_contents)
             with pushd(os.path.join(recipe_dir, "migrations")):
-                os.remove(f"{self.name}.yaml")
+                if os.path.exists(f"{self.name}.yaml"):
+                    os.remove(f"{self.name}.yaml")
             # replace the conda build config with the merged one
             with pushd(recipe_dir), open("conda_build_config.yaml", "w") as f:
                 f.write(merged_cbc)

tests/test_cli.py

@@ -169,7 +169,10 @@ def test_cli_mock_deploy_to_github_git_only(
 
     assert result.exit_code == 0
     cmd_mock.assert_called_once_with(
-        dry_run=False, git_only=git_only, dirs_to_ignore=[]
+        dry_run=False,
+        git_only=git_only,
+        dirs_to_ignore=[],
+        dirs_to_deploy=[],
     )
 
 
@@ -192,7 +195,9 @@ def test_cli_mock_deploy_to_github_dirs_to_ignore(
         kws = {"dirs_to_ignore": []}
 
     assert result.exit_code == 0
-    cmd_mock.assert_called_once_with(dry_run=False, git_only=False, **kws)
+    cmd_mock.assert_called_once_with(
+        dry_run=False, git_only=False, dirs_to_deploy=[], **kws
+    )
 
 
 @pytest.mark.parametrize(

tests_integration/test_integration.py

@@ -304,6 +304,15 @@ def test_scenario(
         invoke_bot_command(["--debug", "deploy-to-github", "--git-only"])
 
     with in_fresh_cf_graph():
+        with mitmproxy_env():
+            invoke_bot_command(["--debug", "prep-auto-tick"])
+        invoke_bot_command(
+            [
+                "--debug",
+                "deploy-to-github",
+                "--dirs-to-deploy=pr_json,version_pr_info,pr_info",
+            ]
+        )
         with mitmproxy_env():
             invoke_bot_command(["--debug", "auto-tick"])
         invoke_bot_command(
@@ -324,6 +333,15 @@ def test_scenario(
     with in_fresh_cf_graph():
         # due to a similar implementation detail, we need to run auto-tick twice
         # for changes to be picked up
+        with mitmproxy_env():
+            invoke_bot_command(["--debug", "prep-auto-tick"])
+        invoke_bot_command(
+            [
+                "--debug",
+                "deploy-to-github",
+                "--dirs-to-deploy=pr_json,version_pr_info,pr_info",
+            ]
+        )
         with mitmproxy_env():
             invoke_bot_command(["--debug", "auto-tick"])
         invoke_bot_command(