BF: pop no default, flush print

scripts/build_conda_package.py

@@ -10,7 +10,7 @@
 import os
 import sys
 
-from fsl_ci_utils import sprun, tempdir
+from fsl_ci_utils import sprun, tempdir, fprint
 
 
 def pre_build_recipe(url, ref, output_dir, *channels):
@@ -29,7 +29,7 @@ def build_recipe(recipe_dir, ref, output_dir, *channels):
     env = dict(os.environ)
 
     if ref == '':
-        env.pop('FSLCONDA_REVISION')
+        env.pop('FSLCONDA_REVISION', None)
     else:
         env['FSLCONDA_REVISION'] = ref
 
@@ -89,14 +89,14 @@ def main():
     sprun(f'conda index {local_channel}')
     sprun('conda install -y -c conda-forge conda-build')
 
-    print('************************************')
-    print(f'Building conda recipe for:              {env["CI_PROJECT_NAME"]}')
-    print(f'Recipe URL:                             {env["CI_PROJECT_URL"]}')
-    print(f'Pre-built packages:                     {prebuild}')
-    print( 'Revision (empty means to build release')
-    print(f'          specified in meta.yaml):      {project_ref}')
-    print(f'FSL conda channel URL:                  {channel_url}')
-    print('************************************')
+    fprint('************************************')
+    fprint(f'Building conda recipe for:              {env["CI_PROJECT_NAME"]}')
+    fprint(f'Recipe URL:                             {env["CI_PROJECT_URL"]}')
+    fprint(f'Pre-built packages:                     {prebuild}')
+    fprint( 'Revision (empty means to build release')
+    fprint(f'          specified in meta.yaml):      {project_ref}')
+    fprint(f'FSL conda channel URL:                  {channel_url}')
+    fprint('************************************')
     build_recipe('.', project_ref, output_dir, local_channel, channel_url)
 
 

utils/fsl_ci_utils/__init__.py

@@ -16,6 +16,11 @@ import fsl_ci_utils.conda_api as api    # noqa # pylint: disable=unused-import
 import fsl_ci_utils.conda     as conda  # noqa # pylint: disable=unused-import
 
 
+def fprint(*args, **kwargs):
+    """Print with flush=True. """
+    print(*args, **kwargs, flush=True)
+
+
 @ctxlib.contextmanager
 def tempdir():
     """Context manager to create, and change into, a temporary directory, and