Revert "fix: ensure we parse recipes with config files"

This reverts commit 298118b.

Author: beckermr

conda_forge_tick/provide_source_code.py

@@ -195,29 +195,17 @@ def _print_out():
 
 
 def _provide_source_code_v1(recipe_dir, variant_config_file):
-
-    var_cfg_files = []
-    global_cbc_pth = os.path.join(os.environ["CONDA_PREFIX"], "conda_build_config.yaml")
-
-    if os.path.exists(global_cbc_pth):
-        var_cfg_files.append(global_cbc_pth)
-
-    if os.path.exists(f"{recipe_dir}/conda_build_config.yaml"):
-        var_cfg_files.append(f"{recipe_dir}/conda_build_config.yaml")
-
-    var_cfg_files.append(variant_config_file)
-
-    cmd = [
-        "rattler-build",
-        "build",
-        "--render-only",
-        "-r",
-        f"{recipe_dir}/recipe.yaml",
-    ]
-    for cfg in var_cfg_files:
-        cmd += ["-m", cfg]
-
-    recipe_json = subprocess.check_output(cmd)
+    recipe_json = subprocess.check_output(
+        [
+            "rattler-build",
+            "build",
+            "--render-only",
+            "-r",
+            f"{recipe_dir}/recipe.yaml",
+            "-m",
+            variant_config_file,
+        ]
+    )
     recipe_meta = json.loads(recipe_json)[0]
     recipe = recipe_meta["recipe"]
     minimal_recipe = {
@@ -233,17 +221,15 @@ def _provide_source_code_v1(recipe_dir, variant_config_file):
     with open(f"{recipe_dir}/minimal_recipe.yaml", "w") as f:
         yaml.dump(minimal_recipe, f)
     try:
-        cmd = [
-            "rattler-build",
-            "build",
-            "-r",
-            f"{recipe_dir}/minimal_recipe.yaml",
-        ]
-        for cfg in var_cfg_files:
-            cmd += ["-m", cfg]
-
         out = subprocess.run(
-            cmd,
+            [
+                "rattler-build",
+                "build",
+                "-r",
+                f"{recipe_dir}/minimal_recipe.yaml",
+                "-m",
+                variant_config_file,
+            ],
             check=False,
             capture_output=True,
         )

conda_forge_tick/update_sources.py

@@ -4,10 +4,8 @@
 import functools
 import json
 import logging
-import os
 import re
 import subprocess
-import tempfile
 import typing
 import urllib.parse
 import urllib.request
@@ -618,14 +616,7 @@ def get_url(self, node_attrs: AttrsTypedDict) -> str | None:
                 else:
                     new_content = content.replace(orig_ver, next_ver)
                 if node_attrs["meta_yaml"].get("schema_version", 0) == 0:
-                    if cbc_data is not None:
-                        with tempfile.TemporaryDirectory() as tmpdir:
-                            cbc_pth = os.path.join(tmpdir, "conda_build_config.yaml")
-                            with open(cbc_pth, "w") as fp:
-                                fp.write(cbc_data)
-                            new_meta = parse_meta_yaml(new_content, cbc_path=cbc_pth)
-                    else:
-                        new_meta = parse_meta_yaml(new_content)
+                    new_meta = parse_meta_yaml(new_content)
                 else:
                     new_meta = parse_recipe_yaml(
                         new_content, platform_arch=platform_arch, cbc_path=cbc_data

conda_forge_tick/utils.py

@@ -510,16 +510,11 @@ def _render_recipe_yaml(
             with open(_cbc_path, "w") as fp:
                 fp.write(str(cbc_path))
 
-            variant_config_flags = ["-m", _cbc_path]
+            variant_config_flags = ["--variant-config", _cbc_path]
         else:
-            variant_config_flags = [] if cbc_path is None else ["-m", str(cbc_path)]
-
-        global_cbc_pth = os.path.join(
-            os.environ["CONDA_PREFIX"], "conda_build_config.yaml"
-        )
-        if os.path.exists(global_cbc_pth):
-            variant_config_flags = ["-m", global_cbc_pth] + variant_config_flags
-
+            variant_config_flags = (
+                [] if cbc_path is None else ["--variant-config", str(cbc_path)]
+            )
         target_platform_flags = (
             []
             if platform_arch is None or variant_config_flags