Add nested recipe check to get_recipes

bioconda_utils/build.py

@@ -1,4 +1,5 @@
 import subprocess as sp
+from itertools import chain
 from collections import defaultdict, namedtuple
 import os
 import logging
@@ -371,6 +372,7 @@ def build_recipes(
     # merge subdags of the selected chunk
     subdag = dag.subgraph(chunks[subdag_i])
 
+
     recipes = [recipe
                for package in subdag
                for recipe in name2recipes[package]]

bioconda_utils/utils.py

@@ -494,6 +494,7 @@ def get_deps(meta, sec):
             return []
         return [dep.split()[0] for dep in deps if dep]
 
+
     def get_inner_deps(dependencies):
         dependencies = list(dependencies)
         for dep in dependencies:
@@ -537,10 +538,10 @@ def get_recipes(recipe_folder, package="*"):
         logger.debug(
             "get_recipes(%s, package='%s'): %s", recipe_folder, package, p)
         path = os.path.join(recipe_folder, p)
-        yield from map(os.path.dirname,
-                       glob.glob(os.path.join(path, "meta.yaml")))
-        yield from map(os.path.dirname,
-                       glob.glob(os.path.join(path, "*", "meta.yaml")))
+        for new_dir in glob.glob(path):
+            for dir_path,dir_names,file_names in os.walk(new_dir):
+                if "meta.yaml" in file_names:
+                    yield dir_path 
 
 
 def get_latest_recipes(recipe_folder, config, package="*"):

test/test_utils.py

@@ -976,3 +976,96 @@ def test_compiler():
         for i in utils.built_package_paths(v):
             assert os.path.exists(i)
             ensure_missing(i)
+
+def test_nested_recipes():
+    """  
+    Test get_recipes ability to identify different nesting depths of recipes 
+    """
+    r = Recipes(
+
+        """
+        shallow:
+            meta.yaml: |
+                package:
+                    name: shallow
+                    version: "0.1"
+            build.sh: |
+                #!/bin/bash
+                echo "Shallow Created"
+                pwd
+        normal/normal:
+            meta.yaml: |
+                package:
+                    name: normal
+                    version: "0.1"
+                build:
+                    skip: true
+                requirements:
+                    build:
+                        - python 3.6
+            build.sh: |
+                #!/bin/bash
+                echo "Testing build.sh through python"
+                python -h
+        deep/deep/deep:
+            meta.yaml: |
+                package:
+                    name: deep
+                    version: "0.1"
+                requirements:
+                    build:
+                        - python
+                    run:
+                        - python
+            build.sh: |
+                #!/bin/bash
+                ## Empty script
+        deeper/deeper/deeper/deeper:
+            meta.yaml: |
+                package:
+                    name: deeper
+                    version: "0.1"
+        F/I/V/E/deep:
+            meta.yaml: |
+                package:
+                    name: fivedeep
+                    version: "0.1"
+                requirements:
+                    build:
+                        - python 3.6
+                    run:
+                        - python 3.6
+        S/I/X/De/e/ep:
+            meta.yaml: |
+                package:
+                    name: ep
+                    version: "0.1"
+        S/E/V/E/N/D/eep:
+            meta.yaml: |
+                package:
+                    name: eep
+                    version: "0.1"
+        T/W/E/N/T/Y/N/E/S/T/D/I/R/E/C/T/O/R/Y/DEEP:
+            meta.yaml: |
+                package:
+                    name: twentydeep
+                    version: "0.1"
+        """, from_string=True)
+    r.write_recipes()
+
+    build_results = build.build_recipes(
+        r.basedir,
+        config={},
+        packages="*",
+        testonly=False,
+        force=False,
+        mulled_test=False,
+    )
+    assert build_results
+
+    assert len(list(utils.get_recipes(r.basedir))) == 8 
+
+    for k, v in r.recipe_dirs.items():
+        for i in utils.built_package_paths(v):
+            assert os.path.exists(i)
+            ensure_missing(i)