Merge pull request #1565 from msarahan/relative_local_channels

allow relative local channels

conda.recipe/meta.yaml

@@ -24,7 +24,7 @@ requirements:
   run:
     - conda-verify
     - conda  >=4.1
-    - contextlib2   [py<3]
+    - contextlib2   [py<34]
     - filelock
     - jinja2
     - patchelf      [linux]

conda_build/api.py

@@ -111,6 +111,9 @@ def test(recipedir_or_package_or_metadata, move_broken=True, config=None, **kwar
                 if os.path.basename(local_location).startswith(platform + "-"):
                     local_location = os.path.dirname(local_location)
             update_index(local_location, config=config)
+            if not os.path.abspath(local_location):
+                local_location = os.path.normpath(os.path.abspath(
+                    os.path.join(os.getcwd(), local_location)))
             local_url = url_path(local_location)
             # channel_urls is an iterable, but we don't know if it's a tuple or list.  Don't know
             #    how to add elements.

conda_build/cli/main_build.py

@@ -8,19 +8,18 @@
 
 import argparse
 import logging
-from os.path import isdir
+import os
 import sys
 
 import filelock
 
 import conda_build.api as api
 import conda_build.build as build
 from conda_build.cli.main_render import (set_language_env_vars, RecipeCompleter,
-                                         render_recipe, get_render_parser, bldpkg_path)
-from conda_build.conda_interface import cc
-from conda_build.conda_interface import add_parser_channels
+                                         get_render_parser, bldpkg_path)
+from conda_build.conda_interface import cc, add_parser_channels, url_path
 import conda_build.source as source
-from conda_build.utils import get_recipe_abspath, silence_loggers, rm_rf, print_skip_message
+from conda_build.utils import silence_loggers, print_skip_message
 from conda_build.config import Config
 
 on_win = (sys.platform == 'win32')
@@ -198,7 +197,19 @@ def execute(args):
     build.check_external()
 
     # change globals in build module, see comment there as well
-    config.channel_urls = args.channel or ()
+    channel_urls = args.channel or ()
+    config.channel_urls = []
+
+    for url in channel_urls:
+        # allow people to specify relative or absolute paths to local channels
+        #    These channels still must follow conda rules - they must have the
+        #    appropriate platform-specific subdir (e.g. win-64)
+        if os.path.isdir(url):
+            if not os.path.isabs(url):
+                url = os.path.normpath(os.path.abspath(os.path.join(os.getcwd(), url)))
+            url = url_path(url)
+        config.channel_urls.append(url)
+
     config.override_channels = args.override_channels
     config.verbose = not args.quiet or args.debug