Merge pull request #2791 from regro/redirect-here

BUG redirect right at the source for getting source code

Author: beckermr

conda_forge_tick/provide_source_code.py

@@ -1,9 +1,12 @@
 import logging
 import os
 import shutil
+import sys
 import tempfile
 from contextlib import contextmanager
 
+import wurlitzer
+
 from conda_forge_tick.os_utils import chmod_plus_rwX, sync_dirs
 from conda_forge_tick.utils import CB_CONFIG, run_container_task
 
@@ -97,23 +100,38 @@ def provide_source_code_local(recipe_dir):
     str
         The path to the source code directory.
     """
-    try:
-        from conda_build.api import render
-        from conda_build.config import Config
-        from conda_build.source import provide
-
-        # Use conda build to do all the downloading/extracting bits
-        md = render(
-            recipe_dir,
-            config=Config(**CB_CONFIG),
-            finalize=False,
-            bypass_env_check=True,
-        )
-        if not md:
-            return None
-        md = md[0][0]
+    out = None
 
-        # provide source dir
-        yield provide(md)
+    def _print_out():
+        try:
+            if out:
+                sys.stdout.write(out.read())
+        except Exception as e:
+            logger.error(
+                "Error printing out/err in getting conda build src!", exc_info=e
+            )
+
+    try:
+        with wurlitzer.pipes(stderr=wurlitzer.STDOUT) as (out, _):
+            from conda_build.api import render
+            from conda_build.config import Config
+            from conda_build.source import provide
+
+            # Use conda build to do all the downloading/extracting bits
+            md = render(
+                recipe_dir,
+                config=Config(**CB_CONFIG),
+                finalize=False,
+                bypass_env_check=True,
+            )
+            if not md:
+                return None
+            md = md[0][0]
+
+            # provide source dir
+            yield provide(md)
     except (SystemExit, Exception) as e:
-        raise RuntimeError("conda build src exception:" + str(e))
+        _print_out()
+        raise RuntimeError("conda build src exception: " + str(e))
+
+    _print_out()

docker/run_bot_task.py

@@ -25,7 +25,6 @@
 from contextlib import contextmanager, redirect_stdout
 
 import click
-import wurlitzer
 
 existing_feedstock_node_attrs_option = click.option(
     "--existing-feedstock-node-attrs",
@@ -154,19 +153,13 @@ def _provide_source_code():
         output_source_code = "/cf_tick_dir/source_dir"
         os.makedirs(output_source_code, exist_ok=True)
 
-        with (
-            wurlitzer.pipes(stderr=wurlitzer.STDOUT) as (out, _),
-            provide_source_code_local(recipe_dir) as cb_work_dir,
-        ):
+        with provide_source_code_local(recipe_dir) as cb_work_dir:
             chmod_plus_rwX(cb_work_dir, recursive=True, skip_on_error=True)
             sync_dirs(
                 cb_work_dir, output_source_code, ignore_dot_git=True, update_git=False
             )
             chmod_plus_rwX(output_source_code, recursive=True, skip_on_error=True)
 
-        # report even if not live
-        sys.stderr.write(out.read())
-
         return dict()