Merge branch 'recipe_meta_yaml' into 1.21.x

conda_build/build.py

@@ -192,17 +192,16 @@ def create_info_files(m, files, include_recipe=True):
  shutil.copytree(src_path, dst_path)
  else:
  shutil.copy(src_path, dst_path)
- os.rename(join(recipe_dir, "meta.yaml"), join(recipe_dir, "meta.yaml.template"))
-
- # store the rendered meta.yaml file, plus information about where it came from
- # and what version of conda-build created it
- metayaml = output_yaml(m)
- with open(join(config.info_dir, "meta.yaml"), 'w') as f:
- f.write("# This file created by conda-build {}\n".format(__version__))
- f.write("# meta.yaml template originally from:\n")
- f.write("# " + source.get_repository_info(m.path) + "\n")
- f.write("# ------------------------------------------------\n\n")
- f.write(metayaml)
+
+ # store the rendered meta.yaml file, plus information about where it came from
+ # and what version of conda-build created it
+ metayaml = output_yaml(m)
+ with open(join(recipe_dir, "meta.yaml.rendered"), 'w') as f:
+ f.write("# This file created by conda-build {}\n".format(__version__))
+ f.write("# meta.yaml template originally from:\n")
+ f.write("# " + source.get_repository_info(m.path) + "\n")
+ f.write("# ------------------------------------------------\n\n")
+ f.write(metayaml)
 
  license_file = m.get_value('about/license_file')
  if license_file:

conda_build/config.py

@@ -58,7 +58,7 @@ def get_conda_py(self):
  croot = abspath(expanduser('~/conda-bld'))
 
  short_build_prefix = join(cc.envs_dirs[0], '_build')
- long_build_prefix = max(short_build_prefix, (short_build_prefix + 8 * '_placehold')[:80])
+ long_build_prefix = max(short_build_prefix, (short_build_prefix + 25 * '_placehold')[:255])
  # XXX: Make this None to be more rigorous about requiring the build_prefix
  # to be known before it is used.
  use_long_build_prefix = False