Merge remote-tracking branch 'origin/remove-recipe-json' into 1.21.x

conda · Jun 12, 2016 · c49d833 · c49d833
2 parents 3916d26 + 508c85e
commit c49d833
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/README.rst b/README.rst
@@ -10,6 +10,13 @@ conda-build
 
 .. image:: https://anaconda.org/conda-team/conda-build/badges/build.svg
                :target: https://anaconda.org/conda-team/conda-build/
+
+.. image:: https://www.quantifiedcode.com/api/v1/project/1960a96404aa431bab5d834edff1cf85/badge.svg
+  :target: https://www.quantifiedcode.com/app/project/1960a96404aa431bab5d834edff1cf85
+  :alt: Code issues
+
+.. image:: https://codecov.io/gh/conda/conda-build/branch/master/graph/badge.svg
+  :target: https://codecov.io/gh/conda/conda-build
 
 
 Installation

diff --git a/conda_build/build.py b/conda_build/build.py
@@ -251,10 +251,6 @@ def create_info_files(m, files, include_recipe=True):
                 d[key] = value
         json.dump(d, fo, indent=2, sort_keys=True)
 
-    if include_recipe:
-        with open(join(config.info_dir, 'recipe.json'), **mode_dict) as fo:
-            json.dump(m.meta, fo, indent=2, sort_keys=True)
-
     if sys.platform == 'win32':
         # make sure we use '/' path separators in metadata
         files = [_f.replace('\\', '/') for _f in files]

diff --git a/tests/test-recipes/metadata/extra_freeform_metadata/meta.yaml b/tests/test-recipes/metadata/extra_freeform_metadata/meta.yaml
@@ -2,6 +2,10 @@ package:
   name: conda-build-test-extra-metadata
   version: 0.1
 
+test:
+  requires:
+    - pyyaml
+
 extra:
   custom: metadata
   however: {we: want}
diff --git a/tests/test-recipes/metadata/extra_freeform_metadata/run_test.py b/tests/test-recipes/metadata/extra_freeform_metadata/run_test.py
@@ -1,5 +1,6 @@
 import os
 import json
+import yaml
 
 
 def main():
@@ -9,9 +10,10 @@ def main():
     with open(info_file, 'r') as fh:
         info = json.load(fh)
 
-    source_file = os.path.join(info['link']['source'], 'info', 'recipe.json')
+    source_file = os.path.join(info['link']['source'],
+                               'info', 'recipe', 'meta.yaml')
     with open(source_file, 'r') as fh:
-        source = json.load(fh)
+        source = yaml.load(fh)
 
     assert source['extra'] == {"custom": "metadata",
                                "however": {"we": "want"}}