Merge pull request #3143 from regro/provide-src-error

fix: use conda-build to parse variant files normally when getting source

Author: beckermr

conda_forge_tick/provide_source_code.py

@@ -16,6 +16,14 @@
 
 logger = logging.getLogger(__name__)
 
+CONDA_BUILD_SPECIAL_KEYS = (
+    "pin_run_as_build",
+    "ignore_version",
+    "ignore_build_only_deps",
+    "extend_keys",
+    "zip_keys",
+)
+
 
 @contextmanager
 def provide_source_code(recipe_dir, use_container=None):
@@ -125,10 +133,6 @@ def _print_out():
             from conda_build.api import render
             from conda_build.config import get_or_merge_config
             from conda_build.source import provide
-            from conda_build.variants import (
-                get_package_variants,
-                list_of_dicts_to_dict_of_lists,
-            )
 
             # Use conda build to do all the downloading/extracting bits
             config = get_or_merge_config(None)
@@ -142,13 +146,12 @@ def _print_out():
                     # try global pinnings
                     os.path.join(os.environ["CONDA_PREFIX"], "conda_build_config.yaml")
                 ]
-            variants = get_package_variants(recipe_dir, config=config)[0]
-            variants = list_of_dicts_to_dict_of_lists([variants])
+
             md = render(
                 recipe_dir,
+                config=config,
                 finalize=False,
                 bypass_env_check=True,
-                variants=variants,
             )
             if not md:
                 return None
@@ -158,6 +161,7 @@ def _print_out():
             yield provide(md)
     except (SystemExit, Exception) as e:
         _print_out()
+        logger.error("Error in getting conda build src!", exc_info=e)
         raise RuntimeError("conda build src exception: " + str(e))
 
     _print_out()

tests/test_container_tasks.py

@@ -31,7 +31,10 @@
 from conda_forge_tick.migration_runner import run_migration_containerized
 from conda_forge_tick.migrators import MigrationYaml, Version
 from conda_forge_tick.os_utils import pushd
-from conda_forge_tick.provide_source_code import provide_source_code_containerized
+from conda_forge_tick.provide_source_code import (
+    provide_source_code_containerized,
+    provide_source_code_local,
+)
 from conda_forge_tick.rerender_feedstock import rerender_feedstock
 from conda_forge_tick.solver_checks import is_recipe_solvable
 from conda_forge_tick.update_recipe.version import update_version_feedstock_dir
@@ -776,3 +779,23 @@ def test_container_tasks_update_version_feedstock_dir():
             output = fp.read()
 
         assert actual_output == output
+
+
+@flaky
+def test_container_tasks_provide_source_code_local(use_containers):
+    with (
+        tempfile.TemporaryDirectory() as tmpdir,
+        pushd(tmpdir),
+    ):
+        subprocess.run(
+            [
+                "git",
+                "clone",
+                "https://github.com/conda-forge/git-remote-s3-feedstock.git",
+            ]
+        )
+
+        with provide_source_code_local("git-remote-s3-feedstock/recipe") as source_dir:
+            assert os.path.exists(source_dir)
+            assert os.path.isdir(source_dir)
+            assert "pyproject.toml" in os.listdir(source_dir)