From 9d0fdb29fc52d2238d02833fa86e4fd95c08f858 Mon Sep 17 00:00:00 2001
From: Michael Sarahan <msarahan@gmail.com>
Date: Thu, 18 Aug 2016 08:28:53 -0500
Subject: [PATCH 1/2] fix typo in convert - interfacegi

---
 conda_build/main_convert.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conda_build/main_convert.py b/conda_build/main_convert.py
index 061f171ca0..d30347e64a 100644
--- a/conda_build/main_convert.py
+++ b/conda_build/main_convert.py
@@ -16,7 +16,7 @@
 from locale import getpreferredencoding
 from os.path import abspath, expanduser, isdir, join, split
 
-from .conda_interfacegi import PY3
+from .conda_interface import PY3
 from .conda_interface import ArgumentParser
 from conda_build.main_build import args_func
 

From 37c6dacdbeba26e727b4b7917b0a6a2e13ebc039 Mon Sep 17 00:00:00 2001
From: Michael Sarahan <msarahan@gmail.com>
Date: Thu, 18 Aug 2016 11:22:13 -0500
Subject: [PATCH 2/2] fix license family in skeleton test; flake8

---
 conda_build/conda_interface.py                |  2 +-
 conda_build/cran.py                           |  3 ++-
 conda_build/source.py                         | 18 +++++++++---------
 tests/test-skeleton/sympy-0.7.5-url/meta.yaml |  1 +
 tests/test-skeleton/sympy-0.7.5/meta.yaml     |  1 +
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/conda_build/conda_interface.py b/conda_build/conda_interface.py
index 80ebd2d0eb..da090e9e91 100644
--- a/conda_build/conda_interface.py
+++ b/conda_build/conda_interface.py
@@ -9,7 +9,7 @@
                               specs_from_args, spec_from_line, specs_from_url)  # NOQA
 from conda.cli.conda_argparse import ArgumentParser  # NOQA
 from conda.compat import (PY3, StringIO, configparser, input, iteritems, lchmod, string_types,  # NOQA
-                          text_type)  # NOQA
+                          text_type, TemporaryDirectory)  # NOQA
 from conda.connection import CondaSession  # NOQA
 from conda.fetch import TmpDownload, download, fetch_index, handle_proxy_407  # NOQA
 from conda.install import (delete_trash, is_linked, linked, linked_data, move_path_to_trash,  # NOQA
diff --git a/conda_build/cran.py b/conda_build/cran.py
index d2bffc9d9d..1ad68b04fa 100644
--- a/conda_build/cran.py
+++ b/conda_build/cran.py
@@ -489,7 +489,8 @@ def main(args, parser):
 
         # XXX: We should maybe normalize these
         d['license'] = cran_package.get("License", "None")
-        d['license_family'] = utils.guess_license_family(d['license'], metadata.allowed_license_families)
+        d['license_family'] = utils.guess_license_family(d['license'],
+                                                         metadata.allowed_license_families)
 
         if 'License_is_FOSS' in cran_package:
             d['license'] += ' (FOSS)'
diff --git a/conda_build/source.py b/conda_build/source.py
index 8b3c29694d..2d9a7a0b28 100644
--- a/conda_build/source.py
+++ b/conda_build/source.py
@@ -1,27 +1,27 @@
 from __future__ import absolute_import, division, print_function
 
-import os
+import locale
 import logging
 import re
-import sys
+import os
 from os.path import join, isdir, isfile, abspath, expanduser, basename
 from shutil import copytree, copy2
 from subprocess import check_call, Popen, PIPE, check_output, CalledProcessError
-if sys.version_info[0] == 3:
-    from urllib.parse import urljoin
-else:
-    from urlparse import urljoin
-import locale
+import sys
 import time
-from conda.compat import TemporaryDirectory
 
-from .conda_interface import download
+from .conda_interface import download, TemporaryDirectory
 from .conda_interface import hashsum_file
 
 from conda_build import external
 from conda_build.config import config
 from conda_build.utils import tar_xf, unzip, safe_print_unicode
 
+if sys.version_info[0] == 3:
+    from urllib.parse import urljoin
+else:
+    from urlparse import urljoin
+
 SRC_CACHE = join(config.croot, 'src_cache')
 GIT_CACHE = join(config.croot, 'git_cache')
 HG_CACHE = join(config.croot, 'hg_cache')
diff --git a/tests/test-skeleton/sympy-0.7.5-url/meta.yaml b/tests/test-skeleton/sympy-0.7.5-url/meta.yaml
index e97fbc0909..3de2ba0625 100644
--- a/tests/test-skeleton/sympy-0.7.5-url/meta.yaml
+++ b/tests/test-skeleton/sympy-0.7.5-url/meta.yaml
@@ -155,6 +155,7 @@ test:
 about:
   home: http://code.google.com/p/sympy
   license: BSD License
+  license_family: BSD
   summary: 'Computer algebra system (CAS) in Python'
 
 # See
diff --git a/tests/test-skeleton/sympy-0.7.5/meta.yaml b/tests/test-skeleton/sympy-0.7.5/meta.yaml
index e0e489f887..cc04421895 100644
--- a/tests/test-skeleton/sympy-0.7.5/meta.yaml
+++ b/tests/test-skeleton/sympy-0.7.5/meta.yaml
@@ -155,6 +155,7 @@ test:
 about:
   home: http://code.google.com/p/sympy
   license:  BSD License
+  license_family: BSD
   summary: 'Computer algebra system (CAS) in Python'
 
 # See