Skip to content

Commit

Permalink
fix license family in skeleton test; flake8
Browse files Browse the repository at this point in the history
  • Loading branch information
msarahan committed Aug 18, 2016
1 parent 3af3bfb commit 37c6dac
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion conda_build/conda_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion conda_build/cran.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand Down
18 changes: 9 additions & 9 deletions conda_build/source.py
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
1 change: 1 addition & 0 deletions tests/test-skeleton/sympy-0.7.5-url/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/test-skeleton/sympy-0.7.5/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 37c6dac

Please sign in to comment.