license: update license metadata and generation code

pkgs/README.rst

@@ -1,52 +1,60 b''
 
 ==============================
  Generate the Nix expressions
 ==============================
 
 Details can be found in the repository of `RhodeCode Enterprise CE`_ inside of
 the file `docs/contributing/dependencies.rst`.
 
 Start the environment as follows:
 
 .. code:: shell
 
    nix-shell pkgs/shell-generate.nix
 
 
 
 Python dependencies
 ===================
 
 .. code:: shell
 
    pip2nix generate --licenses
    # or
    nix-shell pkgs/shell-generate.nix --command "pip2nix generate --licenses"
 
 
 NodeJS dependencies
 ===================
 
 .. code:: shell
 
    rm -rf node_modules
    nix-shell pkgs/shell-generate.nix --command "
        node2nix --input package.json \
                 -o pkgs/node-packages.nix \
                 -e pkgs/node-env.nix \
                 -c pkgs/node-default.nix \
                 -d --flatten --nodejs-6 "
 
 
 
 Bower dependencies
 ==================
 
 .. code:: shell
 
    nix-shell pkgs/shell-generate.nix --command "bower2nix bower.json pkgs/bower-packages.nix"
 
 
+Generate license data
+=====================
+
+.. code:: shell
+
+   nix-build pkgs/license-generate.nix -o result-license && cat result-license/licenses.json | python -m json.tool > rhodecode/config/licenses.json
+
+
 .. Links
 
 .. _RhodeCode Enterprise CE: https://code.rhodecode.com/rhodecode-enterprise-ce

pkgs/license-generate.nix

@@ -1,160 +1,159 b''
 # Utility to generate the license information
 #
 # Usage:
 #
-#   nix-build -I ~/dev license.nix -A result
+#  nix-build license.nix -o result-license
 #
-# Afterwards ./result will contain the license information as JSON files.
+# Afterwards ./result-license will contain the license information as JSON files.
 #
 #
 # Overview
 #
 # Uses two steps to get the relevant license information:
 #
 # 1. Walk down the derivations based on "buildInputs" and
 #    "propagatedBuildInputs". This results in all dependencies based on the nix
 #    declartions.
 #
 # 2. Build Enterprise and query nix-store to get a list of runtime
 #    dependencies. The results from step 1 are then limited to the ones which
 #    are in this list.
 #
-# The result is then available in ./result/license.json.
+# The result is then available in ./result-license/license.json.
 #
 
 
 let
 
   nixpkgs = import <nixpkgs> {};
 
   stdenv = nixpkgs.stdenv;
 
   # Enterprise as simple as possible, goal here is just to identify the runtime
   # dependencies. Ideally we could avoid building Enterprise at all and somehow
   # figure it out without calling into nix-store.
-  enterprise = import ./default.nix {
+  enterprise = import ../default.nix {
     doCheck = false;
   };
 
   # For a given derivation, return the list of all dependencies
   drvToDependencies = drv: nixpkgs.lib.flatten [
-    drv.nativeBuildInputs or []
-    drv.propagatedNativeBuildInputs or []
+    drv.buildInputs or []
+    drv.propagatedBuildInputs or []
   ];
 
   # Transform the given derivation into the meta information which we need in
   # the resulting JSON files.
   drvToMeta = drv: {
-    name = drv.name or "UNNAMED";
+    name = drv.name or drv;
     license = if drv ? meta.license then drv.meta.license else "UNKNOWN";
   };
 
   # Walk the tree of buildInputs and propagatedBuildInputs and return it as a
   # flat list.  Duplicates are avoided.
   listDrvDependencies = drv: let
     addElement = element: seen:
       if (builtins.elem element seen)
       then seen
       else let
         newSeen = seen ++ [ element ];
         newDeps = drvToDependencies element;
       in nixpkgs.lib.fold addElement newSeen newDeps;
     initialElements = drvToDependencies drv;
   in nixpkgs.lib.fold addElement [] initialElements;
 
   # Reads in a file with store paths and returns a list of derivation names.
   #
   # Reads the file, splits the lines, then removes the prefix, so that we
   # end up with a list of derivation names in the end.
   storePathsToDrvNames = srcPath: let
     rawStorePaths = nixpkgs.lib.removeSuffix "\n" (
       builtins.readFile srcPath);
     storePaths = nixpkgs.lib.splitString "\n" rawStorePaths;
-    # TODO: johbo: Would be nice to use some sort of utility here to convert
-    # the path to a derivation name.
     storePathPrefix = (
-      builtins.stringLength "/nix/store/zwy7aavnif9ayw30rya1k6xiacafzzl6-");
+      builtins.stringLength "/nix/store/afafafafafafafafafafafafafafafaf-");
     storePathToName = path:
       builtins.substring storePathPrefix (builtins.stringLength path) path;
   in (map storePathToName storePaths);
 
 in rec {
 
   # Build Enterprise and call nix-store to retrieve the runtime
   # dependencies. The result is available in the nix store.
   runtimeDependencies = stdenv.mkDerivation {
     name = "runtime-dependencies";
     buildInputs = [
       # Needed to query the store
       nixpkgs.nix
     ];
     unpackPhase = ''
       echo "Nothing to unpack"
     '';
     buildPhase = ''
       # Get a list of runtime dependencies
       nix-store -q --references ${enterprise} > nix-store-references
     '';
     installPhase = ''
       mkdir -p $out
       cp -v nix-store-references $out/
     '';
   };
 
   # Produce the license overview files.
   result = let
 
     # Dependencies according to the nix-store
     runtimeDependencyNames = (
       storePathsToDrvNames "${runtimeDependencies}/nix-store-references");
 
     # Dependencies based on buildInputs and propagatedBuildInputs
     enterpriseAllDependencies = listDrvDependencies enterprise;
     enterpriseRuntimeDependencies = let
       elemName = element: element.name or "UNNAMED";
       isRuntime = element: builtins.elem (elemName element) runtimeDependencyNames;
     in builtins.filter isRuntime enterpriseAllDependencies;
 
     # Extract relevant meta information
     enterpriseAllLicenses = map drvToMeta enterpriseAllDependencies;
     enterpriseRuntimeLicenses = map drvToMeta enterpriseRuntimeDependencies;
 
   in stdenv.mkDerivation {
 
     name = "licenses";
 
     buildInputs = [];
 
     unpackPhase = ''
       echo "Nothing to unpack"
     '';
 
     buildPhase = ''
       mkdir build
 
       # Copy list of runtime dependencies for the Python processor
       cp "${runtimeDependencies}/nix-store-references" ./build/nix-store-references
 
       # All licenses which we found by walking buildInputs and
       # propagatedBuildInputs
       cat > build/all-licenses.json <<EOF
       ${builtins.toJSON enterpriseAllLicenses}
       EOF
 
       # License information for our runtime dependencies only. Basically all
       # licenses limited to the items which where also reported by nix-store as
       # a dependency.
       cat > build/licenses.json <<EOF
       ${builtins.toJSON enterpriseRuntimeLicenses}
       EOF
+
     '';
 
     installPhase = ''
       mkdir -p $out
 
       # Store it all, that helps when things go wrong
       cp -rv ./build/* $out
     '';
   };
 
 }

rhodecode/apps/admin/tests/test_admin_settings.py

@@ -1,729 +1,744 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2018 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import mock
 import pytest
 
 import rhodecode
 from rhodecode.apps._base import ADMIN_PREFIX
 from rhodecode.lib.utils2 import md5
 from rhodecode.model.db import RhodeCodeUi
 from rhodecode.model.meta import Session
 from rhodecode.model.settings import SettingsModel, IssueTrackerSettingsModel
 from rhodecode.tests import assert_session_flash
 from rhodecode.tests.utils import AssertResponse
 
 
 UPDATE_DATA_QUALNAME = 'rhodecode.model.update.UpdateModel.get_update_data'
 
 
 def route_path(name, params=None, **kwargs):
     import urllib
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
 
         'admin_settings':
             ADMIN_PREFIX +'/settings',
         'admin_settings_update':
             ADMIN_PREFIX + '/settings/update',
         'admin_settings_global':
             ADMIN_PREFIX + '/settings/global',
         'admin_settings_global_update':
             ADMIN_PREFIX + '/settings/global/update',
         'admin_settings_vcs':
             ADMIN_PREFIX + '/settings/vcs',
         'admin_settings_vcs_update':
             ADMIN_PREFIX + '/settings/vcs/update',
         'admin_settings_vcs_svn_pattern_delete':
             ADMIN_PREFIX + '/settings/vcs/svn_pattern_delete',
         'admin_settings_mapping':
             ADMIN_PREFIX + '/settings/mapping',
         'admin_settings_mapping_update':
             ADMIN_PREFIX + '/settings/mapping/update',
         'admin_settings_visual':
             ADMIN_PREFIX + '/settings/visual',
         'admin_settings_visual_update':
             ADMIN_PREFIX + '/settings/visual/update',
         'admin_settings_issuetracker':
             ADMIN_PREFIX + '/settings/issue-tracker',
         'admin_settings_issuetracker_update':
             ADMIN_PREFIX + '/settings/issue-tracker/update',
         'admin_settings_issuetracker_test':
             ADMIN_PREFIX + '/settings/issue-tracker/test',
         'admin_settings_issuetracker_delete':
             ADMIN_PREFIX + '/settings/issue-tracker/delete',
         'admin_settings_email':
             ADMIN_PREFIX + '/settings/email',
         'admin_settings_email_update':
             ADMIN_PREFIX + '/settings/email/update',
         'admin_settings_hooks':
             ADMIN_PREFIX + '/settings/hooks',
         'admin_settings_hooks_update':
             ADMIN_PREFIX + '/settings/hooks/update',
         'admin_settings_hooks_delete':
             ADMIN_PREFIX + '/settings/hooks/delete',
         'admin_settings_search':
             ADMIN_PREFIX + '/settings/search',
         'admin_settings_labs':
             ADMIN_PREFIX + '/settings/labs',
         'admin_settings_labs_update':
             ADMIN_PREFIX + '/settings/labs/update',
 
         'admin_settings_sessions':
             ADMIN_PREFIX + '/settings/sessions',
         'admin_settings_sessions_cleanup':
             ADMIN_PREFIX + '/settings/sessions/cleanup',
         'admin_settings_system':
             ADMIN_PREFIX + '/settings/system',
         'admin_settings_system_update':
             ADMIN_PREFIX + '/settings/system/updates',
         'admin_settings_open_source':
             ADMIN_PREFIX + '/settings/open_source',
 
 
     }[name].format(**kwargs)
 
     if params:
         base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
     return base_url
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')
 class TestAdminSettingsController(object):
 
     @pytest.mark.parametrize('urlname', [
         'admin_settings_vcs',
         'admin_settings_mapping',
         'admin_settings_global',
         'admin_settings_visual',
         'admin_settings_email',
         'admin_settings_hooks',
         'admin_settings_search',
     ])
     def test_simple_get(self, urlname):
         self.app.get(route_path(urlname))
 
     def test_create_custom_hook(self, csrf_token):
         response = self.app.post(
             route_path('admin_settings_hooks_update'),
             params={
                 'new_hook_ui_key': 'test_hooks_1',
                 'new_hook_ui_value': 'cd /tmp',
                 'csrf_token': csrf_token})
 
         response = response.follow()
         response.mustcontain('test_hooks_1')
         response.mustcontain('cd /tmp')
 
     def test_create_custom_hook_delete(self, csrf_token):
         response = self.app.post(
             route_path('admin_settings_hooks_update'),
             params={
                 'new_hook_ui_key': 'test_hooks_2',
                 'new_hook_ui_value': 'cd /tmp2',
                 'csrf_token': csrf_token})
 
         response = response.follow()
         response.mustcontain('test_hooks_2')
         response.mustcontain('cd /tmp2')
 
         hook_id = SettingsModel().get_ui_by_key('test_hooks_2').ui_id
 
         # delete
         self.app.post(
             route_path('admin_settings_hooks_delete'),
             params={'hook_id': hook_id, 'csrf_token': csrf_token})
         response = self.app.get(route_path('admin_settings_hooks'))
         response.mustcontain(no=['test_hooks_2'])
         response.mustcontain(no=['cd /tmp2'])
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')
 class TestAdminSettingsGlobal(object):
 
     def test_pre_post_code_code_active(self, csrf_token):
         pre_code = 'rc-pre-code-187652122'
         post_code = 'rc-postcode-98165231'
 
         response = self.post_and_verify_settings({
             'rhodecode_pre_code': pre_code,
             'rhodecode_post_code': post_code,
             'csrf_token': csrf_token,
         })
 
         response = response.follow()
         response.mustcontain(pre_code, post_code)
 
     def test_pre_post_code_code_inactive(self, csrf_token):
         pre_code = 'rc-pre-code-187652122'
         post_code = 'rc-postcode-98165231'
         response = self.post_and_verify_settings({
             'rhodecode_pre_code': '',
             'rhodecode_post_code': '',
             'csrf_token': csrf_token,
         })
 
         response = response.follow()
         response.mustcontain(no=[pre_code, post_code])
 
     def test_captcha_activate(self, csrf_token):
         self.post_and_verify_settings({
             'rhodecode_captcha_private_key': '1234567890',
             'rhodecode_captcha_public_key': '1234567890',
             'csrf_token': csrf_token,
         })
 
         response = self.app.get(ADMIN_PREFIX + '/register')
         response.mustcontain('captcha')
 
     def test_captcha_deactivate(self, csrf_token):
         self.post_and_verify_settings({
             'rhodecode_captcha_private_key': '',
             'rhodecode_captcha_public_key': '1234567890',
             'csrf_token': csrf_token,
         })
 
         response = self.app.get(ADMIN_PREFIX + '/register')
         response.mustcontain(no=['captcha'])
 
     def test_title_change(self, csrf_token):
         old_title = 'RhodeCode'
 
         for new_title in ['Changed', 'Żółwik', old_title]:
             response = self.post_and_verify_settings({
                 'rhodecode_title': new_title,
                 'csrf_token': csrf_token,
             })
 
             response = response.follow()
             response.mustcontain(
                 """<div class="branding">- %s</div>""" % new_title)
 
     def post_and_verify_settings(self, settings):
         old_title = 'RhodeCode'
         old_realm = 'RhodeCode authentication'
         params = {
             'rhodecode_title': old_title,
             'rhodecode_realm': old_realm,
             'rhodecode_pre_code': '',
             'rhodecode_post_code': '',
             'rhodecode_captcha_private_key': '',
             'rhodecode_captcha_public_key': '',
             'rhodecode_create_personal_repo_group': False,
             'rhodecode_personal_repo_group_pattern': '${username}',
         }
         params.update(settings)
         response = self.app.post(
             route_path('admin_settings_global_update'), params=params)
 
         assert_session_flash(response, 'Updated application settings')
         app_settings = SettingsModel().get_all_settings()
         del settings['csrf_token']
         for key, value in settings.iteritems():
             assert app_settings[key] == value.decode('utf-8')
 
         return response
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')
 class TestAdminSettingsVcs(object):
 
     def test_contains_svn_default_patterns(self):
         response = self.app.get(route_path('admin_settings_vcs'))
         expected_patterns = [
             '/trunk',
             '/branches/*',
             '/tags/*',
         ]
         for pattern in expected_patterns:
             response.mustcontain(pattern)
 
     def test_add_new_svn_branch_and_tag_pattern(
             self, backend_svn, form_defaults, disable_sql_cache,
             csrf_token):
         form_defaults.update({
             'new_svn_branch': '/exp/branches/*',
             'new_svn_tag': '/important_tags/*',
             'csrf_token': csrf_token,
         })
 
         response = self.app.post(
             route_path('admin_settings_vcs_update'),
             params=form_defaults, status=302)
         response = response.follow()
 
         # Expect to find the new values on the page
         response.mustcontain('/exp/branches/*')
         response.mustcontain('/important_tags/*')
 
         # Expect that those patterns are used to match branches and tags now
         repo = backend_svn['svn-simple-layout'].scm_instance()
         assert 'exp/branches/exp-sphinx-docs' in repo.branches
         assert 'important_tags/v0.5' in repo.tags
 
     def test_add_same_svn_value_twice_shows_an_error_message(
             self, form_defaults, csrf_token, settings_util):
         settings_util.create_rhodecode_ui('vcs_svn_branch', '/test')
         settings_util.create_rhodecode_ui('vcs_svn_tag', '/test')
 
         response = self.app.post(
             route_path('admin_settings_vcs_update'),
             params={
                 'paths_root_path': form_defaults['paths_root_path'],
                 'new_svn_branch': '/test',
                 'new_svn_tag': '/test',
                 'csrf_token': csrf_token,
             },
             status=200)
 
         response.mustcontain("Pattern already exists")
         response.mustcontain("Some form inputs contain invalid data.")
 
     @pytest.mark.parametrize('section', [
         'vcs_svn_branch',
         'vcs_svn_tag',
     ])
     def test_delete_svn_patterns(
             self, section, csrf_token, settings_util):
         setting = settings_util.create_rhodecode_ui(
             section, '/test_delete', cleanup=False)
 
         self.app.post(
             route_path('admin_settings_vcs_svn_pattern_delete'),
             params={
                 'delete_svn_pattern': setting.ui_id,
                 'csrf_token': csrf_token},
             headers={'X-REQUESTED-WITH': 'XMLHttpRequest'})
 
     @pytest.mark.parametrize('section', [
         'vcs_svn_branch',
         'vcs_svn_tag',
     ])
     def test_delete_svn_patterns_raises_404_when_no_xhr(
             self, section, csrf_token, settings_util):
         setting = settings_util.create_rhodecode_ui(section, '/test_delete')
 
         self.app.post(
             route_path('admin_settings_vcs_svn_pattern_delete'),
             params={
                 'delete_svn_pattern': setting.ui_id,
                 'csrf_token': csrf_token},
             status=404)
 
     def test_extensions_hgsubversion(self, form_defaults, csrf_token):
         form_defaults.update({
             'csrf_token': csrf_token,
             'extensions_hgsubversion': 'True',
         })
         response = self.app.post(
             route_path('admin_settings_vcs_update'),
             params=form_defaults,
             status=302)
 
         response = response.follow()
         extensions_input = (
             '<input id="extensions_hgsubversion" '
             'name="extensions_hgsubversion" type="checkbox" '
             'value="True" checked="checked" />')
         response.mustcontain(extensions_input)
 
     def test_extensions_hgevolve(self, form_defaults, csrf_token):
         form_defaults.update({
             'csrf_token': csrf_token,
             'extensions_evolve': 'True',
         })
         response = self.app.post(
             route_path('admin_settings_vcs_update'),
             params=form_defaults,
             status=302)
 
         response = response.follow()
         extensions_input = (
             '<input id="extensions_evolve" '
             'name="extensions_evolve" type="checkbox" '
             'value="True" checked="checked" />')
         response.mustcontain(extensions_input)
 
     def test_has_a_section_for_pull_request_settings(self):
         response = self.app.get(route_path('admin_settings_vcs'))
         response.mustcontain('Pull Request Settings')
 
     def test_has_an_input_for_invalidation_of_inline_comments(self):
         response = self.app.get(route_path('admin_settings_vcs'))
         assert_response = AssertResponse(response)
         assert_response.one_element_exists(
             '[name=rhodecode_use_outdated_comments]')
 
     @pytest.mark.parametrize('new_value', [True, False])
     def test_allows_to_change_invalidation_of_inline_comments(
             self, form_defaults, csrf_token, new_value):
         setting_key = 'use_outdated_comments'
         setting = SettingsModel().create_or_update_setting(
             setting_key, not new_value, 'bool')
         Session().add(setting)
         Session().commit()
 
         form_defaults.update({
             'csrf_token': csrf_token,
             'rhodecode_use_outdated_comments': str(new_value),
         })
         response = self.app.post(
             route_path('admin_settings_vcs_update'),
             params=form_defaults,
             status=302)
         response = response.follow()
         setting = SettingsModel().get_setting_by_name(setting_key)
         assert setting.app_settings_value is new_value
 
     @pytest.mark.parametrize('new_value', [True, False])
     def test_allows_to_change_hg_rebase_merge_strategy(
             self, form_defaults, csrf_token, new_value):
         setting_key = 'hg_use_rebase_for_merging'
 
         form_defaults.update({
             'csrf_token': csrf_token,
             'rhodecode_' + setting_key: str(new_value),
         })
 
         with mock.patch.dict(
                 rhodecode.CONFIG, {'labs_settings_active': 'true'}):
             self.app.post(
                 route_path('admin_settings_vcs_update'),
                 params=form_defaults,
                 status=302)
 
         setting = SettingsModel().get_setting_by_name(setting_key)
         assert setting.app_settings_value is new_value
 
     @pytest.fixture
     def disable_sql_cache(self, request):
         patcher = mock.patch(
             'rhodecode.lib.caching_query.FromCache.process_query')
         request.addfinalizer(patcher.stop)
         patcher.start()
 
     @pytest.fixture
     def form_defaults(self):
         from rhodecode.apps.admin.views.settings import AdminSettingsView
         return AdminSettingsView._form_defaults()
 
     # TODO: johbo: What we really want is to checkpoint before a test run and
     # reset the session afterwards.
     @pytest.fixture(scope='class', autouse=True)
     def cleanup_settings(self, request, baseapp):
         ui_id = RhodeCodeUi.ui_id
         original_ids = list(
             r.ui_id for r in RhodeCodeUi.query().values(ui_id))
 
         @request.addfinalizer
         def cleanup():
             RhodeCodeUi.query().filter(
                 ui_id.notin_(original_ids)).delete(False)
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')
 class TestLabsSettings(object):
     def test_get_settings_page_disabled(self):
         with mock.patch.dict(
                 rhodecode.CONFIG, {'labs_settings_active': 'false'}):
 
             response = self.app.get(
                 route_path('admin_settings_labs'), status=302)
 
         assert response.location.endswith(route_path('admin_settings'))
 
     def test_get_settings_page_enabled(self):
         from rhodecode.apps.admin.views import settings
         lab_settings = [
             settings.LabSetting(
                 key='rhodecode_bool',
                 type='bool',
                 group='bool group',
                 label='bool label',
                 help='bool help'
             ),
             settings.LabSetting(
                 key='rhodecode_text',
                 type='unicode',
                 group='text group',
                 label='text label',
                 help='text help'
             ),
         ]
         with mock.patch.dict(rhodecode.CONFIG,
                              {'labs_settings_active': 'true'}):
             with mock.patch.object(settings, '_LAB_SETTINGS', lab_settings):
                 response = self.app.get(route_path('admin_settings_labs'))
 
         assert '<label>bool group:</label>' in response
         assert '<label for="rhodecode_bool">bool label</label>' in response
         assert '<p class="help-block">bool help</p>' in response
         assert 'name="rhodecode_bool" type="checkbox"' in response
 
         assert '<label>text group:</label>' in response
         assert '<label for="rhodecode_text">text label</label>' in response
         assert '<p class="help-block">text help</p>' in response
         assert 'name="rhodecode_text" size="60" type="text"' in response
 
 
 @pytest.mark.usefixtures('app')
 class TestOpenSourceLicenses(object):
 
     def test_records_are_displayed(self, autologin_user):
-        sample_licenses = {
-            "python2.7-pytest-2.7.1": {
-                "UNKNOWN": None
+        sample_licenses = [
+            {
+                "license": [
+                    {
+                        "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                        "shortName": "bsdOriginal",
+                        "spdxId": "BSD-4-Clause",
+                        "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+                    }
+                ],
+                "name": "python2.7-coverage-3.7.1"
             },
-            "python2.7-Markdown-2.6.2": {
-                "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
+            {
+                "license": [
+                    {
+                        "fullName": "MIT License",
+                        "shortName": "mit",
+                        "spdxId": "MIT",
+                        "url": "http://spdx.org/licenses/MIT.html"
             }
-        }
+                ],
+                "name": "python2.7-bootstrapped-pip-9.0.1"
+            },
+        ]
         read_licenses_patch = mock.patch(
             'rhodecode.apps.admin.views.open_source_licenses.read_opensource_licenses',
             return_value=sample_licenses)
         with read_licenses_patch:
             response = self.app.get(
                 route_path('admin_settings_open_source'), status=200)
 
         assert_response = AssertResponse(response)
         assert_response.element_contains(
             '.panel-heading', 'Licenses of Third Party Packages')
-        for name in sample_licenses:
-            response.mustcontain(name)
-            for license in sample_licenses[name]:
-                assert_response.element_contains('.panel-body', license)
+        for license_data in sample_licenses:
+            response.mustcontain(license_data["license"][0]["spdxId"])
+            assert_response.element_contains('.panel-body', license_data["name"])
 
     def test_records_can_be_read(self, autologin_user):
         response = self.app.get(
             route_path('admin_settings_open_source'), status=200)
         assert_response = AssertResponse(response)
         assert_response.element_contains(
             '.panel-heading', 'Licenses of Third Party Packages')
 
     def test_forbidden_when_normal_user(self, autologin_regular_user):
         self.app.get(
             route_path('admin_settings_open_source'), status=404)
 
 
 @pytest.mark.usefixtures('app')
 class TestUserSessions(object):
 
     def test_forbidden_when_normal_user(self, autologin_regular_user):
         self.app.get(route_path('admin_settings_sessions'), status=404)
 
     def test_show_sessions_page(self, autologin_user):
         response = self.app.get(route_path('admin_settings_sessions'), status=200)
         response.mustcontain('file')
 
     def test_cleanup_old_sessions(self, autologin_user, csrf_token):
 
         post_data = {
             'csrf_token': csrf_token,
             'expire_days': '60'
         }
         response = self.app.post(
             route_path('admin_settings_sessions_cleanup'), params=post_data,
             status=302)
         assert_session_flash(response, 'Cleaned up old sessions')
 
 
 @pytest.mark.usefixtures('app')
 class TestAdminSystemInfo(object):
 
     def test_forbidden_when_normal_user(self, autologin_regular_user):
         self.app.get(route_path('admin_settings_system'), status=404)
 
     def test_system_info_page(self, autologin_user):
         response = self.app.get(route_path('admin_settings_system'))
         response.mustcontain('RhodeCode Community Edition, version {}'.format(
             rhodecode.__version__))
 
     def test_system_update_new_version(self, autologin_user):
         update_data = {
             'versions': [
                 {
                     'version': '100.3.1415926535',
                     'general': 'The latest version we are ever going to ship'
                 },
                 {
                     'version': '0.0.0',
                     'general': 'The first version we ever shipped'
                 }
             ]
         }
         with mock.patch(UPDATE_DATA_QUALNAME, return_value=update_data):
             response = self.app.get(route_path('admin_settings_system_update'))
             response.mustcontain('A <b>new version</b> is available')
 
     def test_system_update_nothing_new(self, autologin_user):
         update_data = {
             'versions': [
                 {
                     'version': '0.0.0',
                     'general': 'The first version we ever shipped'
                 }
             ]
         }
         with mock.patch(UPDATE_DATA_QUALNAME, return_value=update_data):
             response = self.app.get(route_path('admin_settings_system_update'))
             response.mustcontain(
                 'This instance is already running the <b>latest</b> stable version')
 
     def test_system_update_bad_response(self, autologin_user):
         with mock.patch(UPDATE_DATA_QUALNAME, side_effect=ValueError('foo')):
             response = self.app.get(route_path('admin_settings_system_update'))
             response.mustcontain(
                 'Bad data sent from update server')
 
 
 @pytest.mark.usefixtures("app")
 class TestAdminSettingsIssueTracker(object):
     RC_PREFIX = 'rhodecode_'
     SHORT_PATTERN_KEY = 'issuetracker_pat_'
     PATTERN_KEY = RC_PREFIX + SHORT_PATTERN_KEY
 
     def test_issuetracker_index(self, autologin_user):
         response = self.app.get(route_path('admin_settings_issuetracker'))
         assert response.status_code == 200
 
     def test_add_empty_issuetracker_pattern(
             self, request, autologin_user, csrf_token):
         post_url = route_path('admin_settings_issuetracker_update')
         post_data = {
             'csrf_token': csrf_token
         }
         self.app.post(post_url, post_data, status=302)
 
     def test_add_issuetracker_pattern(
             self, request, autologin_user, csrf_token):
         pattern = 'issuetracker_pat'
         another_pattern = pattern+'1'
         post_url = route_path('admin_settings_issuetracker_update')
         post_data = {
             'new_pattern_pattern_0': pattern,
             'new_pattern_url_0': 'http://url',
             'new_pattern_prefix_0': 'prefix',
             'new_pattern_description_0': 'description',
             'new_pattern_pattern_1': another_pattern,
             'new_pattern_url_1': 'https://url1',
             'new_pattern_prefix_1': 'prefix1',
             'new_pattern_description_1': 'description1',
             'csrf_token': csrf_token
         }
         self.app.post(post_url, post_data, status=302)
         settings = SettingsModel().get_all_settings()
         self.uid = md5(pattern)
         assert settings[self.PATTERN_KEY+self.uid] == pattern
         self.another_uid = md5(another_pattern)
         assert settings[self.PATTERN_KEY+self.another_uid] == another_pattern
 
         @request.addfinalizer
         def cleanup():
             defaults = SettingsModel().get_all_settings()
 
             entries = [name for name in defaults if (
                 (self.uid in name) or (self.another_uid) in name)]
             start = len(self.RC_PREFIX)
             for del_key in entries:
                 # TODO: anderson: get_by_name needs name without prefix
                 entry = SettingsModel().get_setting_by_name(del_key[start:])
                 Session().delete(entry)
 
             Session().commit()
 
     def test_edit_issuetracker_pattern(
             self, autologin_user, backend, csrf_token, request):
         old_pattern = 'issuetracker_pat'
         old_uid = md5(old_pattern)
         pattern = 'issuetracker_pat_new'
         self.new_uid = md5(pattern)
 
         SettingsModel().create_or_update_setting(
             self.SHORT_PATTERN_KEY+old_uid, old_pattern, 'unicode')
 
         post_url = route_path('admin_settings_issuetracker_update')
         post_data = {
             'new_pattern_pattern_0': pattern,
             'new_pattern_url_0': 'https://url',
             'new_pattern_prefix_0': 'prefix',
             'new_pattern_description_0': 'description',
             'uid': old_uid,
             'csrf_token': csrf_token
         }
         self.app.post(post_url, post_data, status=302)
         settings = SettingsModel().get_all_settings()
         assert settings[self.PATTERN_KEY+self.new_uid] == pattern
         assert self.PATTERN_KEY+old_uid not in settings
 
         @request.addfinalizer
         def cleanup():
             IssueTrackerSettingsModel().delete_entries(self.new_uid)
 
     def test_replace_issuetracker_pattern_description(
             self, autologin_user, csrf_token, request, settings_util):
         prefix = 'issuetracker'
         pattern = 'issuetracker_pat'
         self.uid = md5(pattern)
         pattern_key = '_'.join([prefix, 'pat', self.uid])
         rc_pattern_key = '_'.join(['rhodecode', pattern_key])
         desc_key = '_'.join([prefix, 'desc', self.uid])
         rc_desc_key = '_'.join(['rhodecode', desc_key])
         new_description = 'new_description'
 
         settings_util.create_rhodecode_setting(
             pattern_key, pattern, 'unicode', cleanup=False)
         settings_util.create_rhodecode_setting(
             desc_key, 'old description', 'unicode', cleanup=False)
 
         post_url = route_path('admin_settings_issuetracker_update')
         post_data = {
             'new_pattern_pattern_0': pattern,
             'new_pattern_url_0': 'https://url',
             'new_pattern_prefix_0': 'prefix',
             'new_pattern_description_0': new_description,
             'uid': self.uid,
             'csrf_token': csrf_token
         }
         self.app.post(post_url, post_data, status=302)
         settings = SettingsModel().get_all_settings()
         assert settings[rc_pattern_key] == pattern
         assert settings[rc_desc_key] == new_description
 
         @request.addfinalizer
         def cleanup():
             IssueTrackerSettingsModel().delete_entries(self.uid)
 
     def test_delete_issuetracker_pattern(
             self, autologin_user, backend, csrf_token, settings_util):
         pattern = 'issuetracker_pat'
         uid = md5(pattern)
         settings_util.create_rhodecode_setting(
             self.SHORT_PATTERN_KEY+uid, pattern, 'unicode', cleanup=False)
 
         post_url = route_path('admin_settings_issuetracker_delete')
         post_data = {
             '_method': 'delete',
             'uid': uid,
             'csrf_token': csrf_token
         }
         self.app.post(post_url, post_data, status=302)
         settings = SettingsModel().get_all_settings()
         assert 'rhodecode_%s%s' % (self.SHORT_PATTERN_KEY, uid) not in settings

rhodecode/apps/admin/views/open_source_licenses.py

@@ -1,53 +1,51 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2018 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import collections
 import logging
 
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.apps.admin.navigation import navigation_list
 from rhodecode.lib.auth import (LoginRequired, HasPermissionAllDecorator)
 from rhodecode.lib.utils import read_opensource_licenses
 
 log = logging.getLogger(__name__)
 
 
 class OpenSourceLicensesAdminSettingsView(BaseAppView):
 
     def load_default_context(self):
         c = self._get_local_tmpl_context()
-
         return c
 
     @LoginRequired()
     @HasPermissionAllDecorator('hg.admin')
     @view_config(
         route_name='admin_settings_open_source', request_method='GET',
         renderer='rhodecode:templates/admin/settings/settings.mako')
     def open_source_licenses(self):
         c = self.load_default_context()
         c.active = 'open_source'
         c.navlist = navigation_list(self.request)
-        items = sorted(read_opensource_licenses().items(), key=lambda t: t[0])
-        c.opensource_licenses = collections.OrderedDict(items)
-
+        c.opensource_licenses = sorted(
+            read_opensource_licenses(), key=lambda d: d["name"])
         return self._get_template_context(c)

rhodecode/config/licenses.json

@@ -1,369 +1,1912 b''
+[
 {
-  "libnghttp2-1.7.1": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            },
+            {
+                "fullName": "Zope Public License 2.0",
+                "shortName": "zpl20",
+                "spdxId": "ZPL-2.0",
+                "url": "http://spdx.org/licenses/ZPL-2.0.html"
+            }
+        ],
+        "name": "python2.7-setuptools-38.4.0"
   }, 
-  "nodejs-4.3.1": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": {
+            "fullName": "Python Software Foundation License version 2",
+            "shortName": "psfl",
+            "spdxId": "Python-2.0",
+            "url": "http://spdx.org/licenses/Python-2.0.html"
+        },
+        "name": "python-2.7.15"
   },
-  "python-2.7.12": {
-    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-coverage-3.7.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-bootstrapped-pip-9.0.1"
   }, 
-  "python2.7-Babel-1.3": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-cov-core-1.15.0"
   }, 
-  "python2.7-Beaker-1.7.0": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-webtest-2.0.29"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-beautifulsoup4-4.6.3"
   }, 
-  "python2.7-Chameleon-2.24": {
-    "BSD-like": "http://repoze.org/license.html"
+    {
+        "license": [
+            {
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
+            }
+        ],
+        "name": "python2.7-waitress-1.1.0"
   },
-  "python2.7-FormEncode-1.2.4": {
-    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-webob-1.7.4"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-six-1.11.0"
   }, 
-  "python2.7-Jinja2-2.7.3": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-mock-1.0.1"
   }, 
-  "python2.7-Mako-1.0.6": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            },
+            {
+                "fullName": "DFSG approved"
+            }
+        ],
+        "name": "python2.7-pytest-timeout-1.2.1"
   }, 
-  "python2.7-Markdown-2.6.7": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pytest-3.6.0"
   }, 
-  "python2.7-MarkupSafe-0.23": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "ASL"
+            },
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-funcsigs-1.0.2"
   }, 
-  "python2.7-Paste-2.0.3": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pluggy-0.6.0"
   }, 
-  "python2.7-PasteDeploy-1.5.2": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-atomicwrites-1.1.5"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-more-itertools-4.3.0"
   }, 
-  "python2.7-PasteScript-1.7.5": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-attrs-18.1.0"
   }, 
-  "python2.7-Pygments-2.2.0": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-py-1.5.3"
+    },
+    {
+        "license": [
+            {
+                "fullName": "GNU Lesser General Public License v3 or later (LGPLv3+)"
+            },
+            {
+                "fullName": "LGPL"
+            }
+        ],
+        "name": "python2.7-gprof2dot-2017.9.19"
   },
-  "python2.7-Routes-1.13": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pytest-profiling-1.3.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pytest-runner-4.2"
   }, 
-  "python2.7-SQLAlchemy-0.9.9": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-setuptools-scm-2.1.0"
   }, 
-  "python2.7-Tempita-0.5.2": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-pytest-sugar-0.9.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-termcolor-1.1.0"
   }, 
-  "python2.7-URLObject-2.4.0": {
-    "The Unlicense": "http://unlicense.org/"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
   }, 
-  "python2.7-WebError-0.10.3": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pytest-cov-2.5.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-appenlight-client-0.6.25"
   }, 
-  "python2.7-WebHelpers-1.3": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-requests-2.9.1"
   }, 
-  "python2.7-WebHelpers2-2.0": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "AGPLv3 and Proprietary"
+            }
+        ],
+        "name": "python2.7-rhodecode-tools-0.16.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "BSD 2-clause \"Simplified\" License",
+                "shortName": "bsd2",
+                "spdxId": "BSD-2-Clause",
+                "url": "http://spdx.org/licenses/BSD-2-Clause.html"
+            }
+        ],
+        "name": "python2.7-whoosh-2.7.4"
   }, 
-  "python2.7-WebOb-1.3.1": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-urllib3-1.21"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch-dsl-2.2.0"
   }, 
-  "python2.7-Whoosh-2.7.4": {
-    "BSD 2-clause \"Simplified\" License": "http://spdx.org/licenses/BSD-2-Clause", 
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch-2.3.0"
   }, 
-  "python2.7-alembic-0.8.4": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            },
+            {
+                "fullName": "Dual License"
+            }
+        ],
+        "name": "python2.7-python-dateutil-2.7.3"
   },
-  "python2.7-appenlight-client-0.6.14": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-markupsafe-1.0"
   }, 
-  "python2.7-authomatic-0.1.0.post1": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-mako-1.0.7"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-future-0.14.3"
   },
-  "python2.7-backports.shutil-get-terminal-size-1.0.0": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-click-6.6"
   }, 
-  "python2.7-bleach-1.5.0": {
-    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-bottle-0.12.13"
   }, 
-  "python2.7-celery-2.2.10": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-cprofilev-1.0.7"
   }, 
-  "python2.7-channelstream-0.5.2": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-ipython-5.1.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "GNU General Public License v3 (GPLv3)"
+            },
+            {
+                "fullName": "GNU General Public License v1.0 only",
+                "shortName": "gpl1",
+                "spdxId": "GPL-1.0",
+                "url": "http://spdx.org/licenses/GPL-1.0.html"
+            }
+        ],
+        "name": "python2.7-gnureadline-6.3.8"
   }, 
-  "python2.7-click-5.1": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "ISC License",
+                "shortName": "isc",
+                "spdxId": "ISC",
+                "url": "http://spdx.org/licenses/ISC.html"
+            },
+            {
+                "fullName": "ISC License (ISCL)"
+            }
+        ],
+        "name": "python2.7-pexpect-4.6.0"
   }, 
-  "python2.7-colander-1.2": {
-    "Repoze License": "http://www.repoze.org/LICENSE.txt"
+    {
+        "license": [],
+        "name": "python2.7-ptyprocess-0.6.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pathlib2-2.3.0"
   }, 
-  "python2.7-configobj-5.0.6": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
   }, 
-  "python2.7-configparser-3.5.0": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+            {
+                "fullName": "New BSD License"
+            }
+        ],
+        "name": "python2.7-scandir-1.9.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-backports.shutil-get-terminal-size-1.0.0"
   }, 
-  "python2.7-cssselect-1.0.1": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-pygments-2.2.0"
   }, 
-  "python2.7-decorator-4.0.11": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-prompt-toolkit-1.0.15"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-wcwidth-0.1.7"
   }, 
-  "python2.7-deform-2.0a2": {
-    "BSD-derived": "http://www.repoze.org/LICENSE.txt"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-traitlets-4.3.2"
   }, 
-  "python2.7-docutils-0.12": {
-    "BSD 2-clause \"Simplified\" License": "http://spdx.org/licenses/BSD-2-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-enum34-1.1.6"
   }, 
-  "python2.7-dogpile.cache-0.6.1": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "new BSD License"
+            }
+        ],
+        "name": "python2.7-decorator-4.1.2"
   }, 
-  "python2.7-dogpile.core-0.4.1": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-ipython-genutils-0.2.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
+            }
+        ],
+        "name": "python2.7-simplegeneric-0.8.1"
   }, 
-  "python2.7-elasticsearch-2.3.0": {
-    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pickleshare-0.7.4"
   }, 
-  "python2.7-elasticsearch-dsl-2.2.0": {
-    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-ipdb-0.11"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-gunicorn-19.9.0"
   }, 
-  "python2.7-entrypoints-0.2.2": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-futures-3.0.2"
   }, 
-  "python2.7-enum34-1.1.6": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-greenlet-0.4.13"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-gevent-1.3.5"
   }, 
-  "python2.7-functools32-3.2.3.post2": {
-    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-psutil-5.4.6"
   }, 
-  "python2.7-future-0.14.3": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-bumpversion-0.5.3"
   }, 
-  "python2.7-futures-3.0.2": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-invoke-0.13.0"
   }, 
-  "python2.7-gevent-1.1.2": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-alembic-0.9.9"
+    },
+    {
+        "license": {
+            "fullName": "Apache License 2.0",
+            "shortName": "asl20",
+            "spdxId": "Apache-2.0",
+            "url": "http://spdx.org/licenses/Apache-2.0.html"
+        },
+        "name": "python2.7-python-editor-1.0.3"
   }, 
-  "python2.7-gnureadline-6.3.3": {
-    "GNU General Public License v1.0 only": "http://spdx.org/licenses/GPL-1.0"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-sqlalchemy-1.1.18"
   }, 
-  "python2.7-gprof2dot-2016.10.13": {
-    "GNU Lesser General Public License v3.0 or later": "http://spdx.org/licenses/LGPL-3.0+"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-jupyter-client-5.0.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
   }, 
-  "python2.7-greenlet-0.4.10": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+            {
+                "fullName": "LGPL+BSD"
+            },
+            {
+                "fullName": "GNU Library or Lesser General Public License (LGPL)"
+            }
+        ],
+        "name": "python2.7-pyzmq-14.6.0"
   }, 
-  "python2.7-gunicorn-19.6.0": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-jupyter-core-4.4.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-nbformat-4.4.0"
   }, 
-  "python2.7-html5lib-0.9999999": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-jsonschema-2.6.0"
   }, 
-  "python2.7-infrae.cache-1.0.1": {
-    "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
+    {
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            }
+        ],
+        "name": "python2.7-functools32-3.2.3.post2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-bleach-2.1.4"
   }, 
-  "python2.7-ipython-5.1.0": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-html5lib-1.0.1"
   }, 
-  "python2.7-ipython-genutils-0.2.0": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-webencodings-0.5.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-nbconvert-5.3.1"
   }, 
-  "python2.7-iso8601-0.1.11": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-testpath-0.3.1"
   }, 
-  "python2.7-itsdangerous-0.24": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-pandocfilters-1.4.2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-entrypoints-0.2.2"
   }, 
-  "python2.7-jsonschema-2.6.0": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-configparser-3.5.0"
   }, 
-  "python2.7-jupyter-client-5.0.0": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-jinja2-2.9.6"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-mistune-0.8.3"
   }, 
-  "python2.7-jupyter-core-4.3.0": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
+            }
+        ],
+        "name": "python2.7-zope.interface-4.5.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
+            }
+        ],
+        "name": "python2.7-zope.event-4.3.0"
   }, 
-  "python2.7-kombu-4.1.0": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
+            }
+        ],
+        "name": "python2.7-zope.deprecation-4.3.0"
   }, 
-  "python2.7-mistune-0.7.4": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
+            }
+        ],
+        "name": "python2.7-zope.cachedescriptors-4.3.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "PSF or ZPL"
+            }
+        ],
+        "name": "python2.7-wsgiref-0.1.2"
   }, 
-  "python2.7-msgpack-python-0.4.8": {
-    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-webhelpers-1.3"
   }, 
-  "python2.7-nbconvert-5.1.1": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-webhelpers2-2.0"
   }, 
-  "python2.7-nbformat-4.3.0": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-weberror-0.10.3"
   }, 
-  "python2.7-packaging-15.2": {
-    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-paste-2.0.3"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-tempita-0.5.2"
+    },
+    {
+        "license": {
+            "fullName": "Repoze License",
+            "url": "http://www.repoze.org/LICENSE.txt"
+        },
+        "name": "python2.7-venusian-1.1.0"
   }, 
-  "python2.7-pandocfilters-1.4.1": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": {
+            "fullName": "The Unlicense",
+            "spdxId": "Unlicense",
+            "url": "http://unlicense.org/"
+        },
+        "name": "python2.7-urlobject-2.4.3"
   }, 
-  "python2.7-pathlib2-2.1.0": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-trollius-1.0.4"
+    },
+    {
+        "license": {
+            "fullName": "Repoze License",
+            "url": "http://www.repoze.org/LICENSE.txt"
+        },
+        "name": "python2.7-translationstring-1.3"
   }, 
-  "python2.7-peppercorn-0.5": {
-    "BSD-derived": "http://www.repoze.org/LICENSE.txt"
+    {
+        "license": [
+            {
+                "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
+            }
+        ],
+        "name": "python2.7-supervisor-3.3.4"
   }, 
-  "python2.7-pexpect-4.2.1": {
-    "ISC License": "http://spdx.org/licenses/ISC"
+    {
+        "license": [
+            {
+                "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
+            }
+        ],
+        "name": "python2.7-meld3-1.0.2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            }
+        ],
+        "name": "python2.7-subprocess32-3.5.1"
   }, 
-  "python2.7-pickleshare-0.7.4": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-sshpubkeys-2.2.0"
   }, 
-  "python2.7-prompt-toolkit-1.0.14": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-ecdsa-0.13"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Public Domain",
+                "shortName": "publicDomain"
+            }
+        ],
+        "name": "python2.7-pycrypto-2.6.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Academic Free License (AFL)"
   }, 
-  "python2.7-psutil-4.3.1": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-simplejson-3.11.1"
   }, 
-  "python2.7-psycopg2-2.6.1": {
-    "GNU Lesser General Public License v3.0 or later": "http://spdx.org/licenses/LGPL-3.0+"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-setproctitle-1.1.10"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-routes-2.4.1"
+    },
+    {
+        "license": {
+            "fullName": "Repoze License",
+            "url": "http://www.repoze.org/LICENSE.txt"
   }, 
-  "python2.7-ptyprocess-0.5.1": {
-    "ISC License": "http://opensource.org/licenses/ISC"
+        "name": "python2.7-repoze.lru-0.7"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-redis-2.10.6"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-py-gfm-0.1.3"
   },
-  "python2.7-py-1.4.31": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-markdown-2.6.11"
   }, 
-  "python2.7-py-bcrypt-0.4": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-tzlocal-1.5.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pytz-2018.4"
   }, 
-  "python2.7-py-gfm-0.1.3.rhodecode-upstream1": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "License :: OSI Approved :: MIT License"
   }, 
-  "python2.7-pycrypto-2.6.1": {
-    "Public Domain": null
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-python-pam-1.8.4"
+    },
+    {
+        "license": [
+            {
+                "fullName": "GNU General Public License v1.0 only",
+                "shortName": "gpl1",
+                "spdxId": "GPL-1.0",
+                "url": "http://spdx.org/licenses/GPL-1.0.html"
+            }
+        ],
+        "name": "linux-pam-1.3.0"
   }, 
-  "python2.7-pycurl-7.19.5": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            }
+        ],
+        "name": "python2.7-python-memcached-1.59"
   }, 
-  "python2.7-pygments-markdown-lexer-0.1.0.dev39": {
-    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
+    {
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            }
+        ],
+        "name": "python2.7-python-ldap-3.1.0"
+    },
+    {
+        "license": {
+            "fullName": "MIT License",
+            "shortName": "mit",
+            "spdxId": "MIT",
+            "url": "http://spdx.org/licenses/MIT.html"
+        },
+        "name": "libkrb5-1.15.2"
+    },
+    {
+        "license":{
+            "fullName": "BSD-derived (https://www.openldap.org/software/release/license.html)"
+        },
+        "name": "openldap-2.4.45"
   }, 
-  "python2.7-pyparsing-1.5.7": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-pyasn1-modules-0.2.2"
   }, 
-  "python2.7-pyramid-1.7.4": {
-    "Repoze License": "http://www.repoze.org/LICENSE.txt"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-pyasn1-0.4.4"
   }, 
-  "python2.7-pyramid-beaker-0.8": {
-    "Repoze License": "http://www.repoze.org/LICENSE.txt"
+    {
+        "license": [
+            {
+                "fullName": "zlib License",
+                "shortName": "zlib",
+                "spdxId": "Zlib",
+                "url": "http://spdx.org/licenses/Zlib.html"
+            },
+            {
+                "fullName": "libpng License",
+                "shortName": "libpng",
+                "spdxId": "Libpng",
+                "url": "http://spdx.org/licenses/Libpng.html"
+            }
+        ],
+        "name": "python2.7-pysqlite-2.8.3"
   }, 
-  "python2.7-pyramid-debugtoolbar-3.0.5": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause", 
-    "Repoze License": "http://www.repoze.org/LICENSE.txt"
+    {
+        "license": {
+            "fullName": "Repoze License",
+            "url": "http://www.repoze.org/LICENSE.txt"
+        },
+        "name": "python2.7-pyramid-1.9.2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-hupper-1.3"
   }, 
-  "python2.7-pyramid-jinja2-2.5": {
-    "BSD-derived": "http://www.repoze.org/LICENSE.txt"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-plaster-pastedeploy-0.6"
   }, 
-  "python2.7-pyramid-mako-1.0.2": {
-    "Repoze License": "http://www.repoze.org/LICENSE.txt"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-plaster-1.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pastedeploy-1.5.2"
   }, 
-  "python2.7-pysqlite-2.6.3": {
-    "libpng License": "http://spdx.org/licenses/Libpng", 
-    "zlib License": "http://spdx.org/licenses/Zlib"
+    {
+        "license": {
+            "fullName": "Repoze License",
+            "url": "http://www.repoze.org/LICENSE.txt"
+        },
+        "name": "python2.7-pyramid-mako-1.0.2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Repoze Public License"
   }, 
-  "python2.7-pytest-3.0.5": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+            {
+                "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
+            }
+        ],
+        "name": "python2.7-pyramid-jinja2-2.7"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "Repoze License",
+                "url": "http://www.repoze.org/LICENSE.txt"
+            }
+        ],
+        "name": "python2.7-pyramid-debugtoolbar-4.4"
   }, 
-  "python2.7-pytest-profiling-1.2.2": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            }
+        ],
+        "name": "python2.7-ipaddress-1.0.22"
+    },
+    {
+        "license": {
+            "fullName": "Repoze License",
+            "url": "http://www.repoze.org/LICENSE.txt"
+        },
+        "name": "python2.7-pyramid-beaker-0.8"
   }, 
-  "python2.7-pytest-runner-2.9": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-beaker-1.9.1"
   }, 
-  "python2.7-pytest-sugar-0.7.1": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pyparsing-1.5.7"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-pygments-markdown-lexer-0.1.0.dev39"
   }, 
-  "python2.7-pytest-timeout-1.2.0": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pyflakes-0.8.1"
   }, 
-  "python2.7-python-dateutil-2.1": {
-    "Simplified BSD": null
+    {
+        "license": {
+            "fullName": "MIT License",
+            "shortName": "mit",
+            "spdxId": "MIT",
+            "url": "http://spdx.org/licenses/MIT.html"
+        },
+        "name": "python2.7-pycurl-7.43.0.2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-py-bcrypt-0.4"
   }, 
-  "python2.7-python-editor-1.0.3": {
-    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
+    {
+        "license": {
+            "fullName": "GNU Lesser General Public License v3.0 or later",
+            "shortName": "lgpl3Plus",
+            "spdxId": "LGPL-3.0+",
+            "url": "http://spdx.org/licenses/LGPL-3.0+.html"
+        },
+        "name": "python2.7-psycopg2-2.7.4"
+    },
+    {
+        "license": {
+            "fullName": "PostgreSQL License",
+            "shortName": "postgresql",
+            "spdxId": "PostgreSQL",
+            "url": "http://spdx.org/licenses/PostgreSQL.html"
+        },
+        "name": "postgresql-9.6.10"
   }, 
-  "python2.7-python-ldap-2.4.19": {
-    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
+    {
+        "license": [
+            {
+                "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
+            }
+        ],
+        "name": "python2.7-peppercorn-0.5"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pastescript-2.0.2"
   }, 
-  "python2.7-python-memcached-1.57": {
-    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-packaging-15.2"
   }, 
-  "python2.7-pytz-2015.4": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-objgraph-3.1.1"
   }, 
-  "python2.7-pyzmq-14.6.0": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-graphviz-0.9"
   },
-  "python2.7-repoze.lru-0.6": {
-    "Repoze License": "http://www.repoze.org/LICENSE.txt"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-pyotp-2.2.6"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pymysql-0.8.1"
   }, 
-  "python2.7-requests-2.9.1": {
-    "Apache License 2.0": "http://spdx.org/licenses/Apache-2.0"
+    {
+        "license": [
+            {
+                "fullName": "GNU General Public License v1.0 only",
+                "shortName": "gpl1",
+                "spdxId": "GPL-1.0",
+                "url": "http://spdx.org/licenses/GPL-1.0.html"
+            }
+        ],
+        "name": "python2.7-mysql-python-1.2.5"
   },
-  "python2.7-setuptools-scm-1.15.6": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": {
+            "fullName": "GNU Library General Public License v2.1 only",
+            "shortName": "lgpl21",
+            "spdxId": "LGPL-2.1",
+            "url": "http://spdx.org/licenses/LGPL-2.1.html"
+        },
+        "name": "mariadb-connector-c-2.3.4"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-msgpack-python-0.5.6"
   }, 
-  "python2.7-simplegeneric-0.8.1": {
-    "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-lxml-3.7.3"
   }, 
-  "python2.7-simplejson-3.7.2": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-wheel-0.30.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-kombu-4.2.0"
   }, 
-  "python2.7-six-1.9.0": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-amqp-2.3.1"
   }, 
-  "python2.7-subprocess32-3.2.6": {
-    "Python Software Foundation License version 2": "http://spdx.org/licenses/Python-2.0"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-vine-1.1.4"
   }, 
-  "python2.7-termcolor-1.1.0": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-billiard-3.5.0.3"
   }, 
-  "python2.7-testpath-0.1": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-itsdangerous-0.24"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-iso8601-0.1.11"
   }, 
-  "python2.7-traitlets-4.3.2": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
+            }
+        ],
+        "name": "python2.7-infrae.cache-1.0.1"
   }, 
-  "python2.7-translationstring-1.3": {
-    "Repoze License": "http://www.repoze.org/LICENSE.txt"
+    {
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            }
+        ],
+        "name": "python2.7-formencode-1.2.4"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-dogpile.core-0.4.1"
   }, 
-  "python2.7-urllib3-1.16": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-dogpile.cache-0.6.6"
   }, 
-  "python2.7-venusian-1.0": {
-    "Repoze License": "http://www.repoze.org/LICENSE.txt"
+    {
+        "license": {
+            "fullName": "BSD 2-clause \"Simplified\" License",
+            "shortName": "bsd2",
+            "spdxId": "BSD-2-Clause",
+            "url": "http://spdx.org/licenses/BSD-2-Clause.html"
+        },
+        "name": "python2.7-docutils-0.14"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
+            }
+        ],
+        "name": "python2.7-deform-2.0.5"
+    },
+    {
+        "license": {
+            "fullName": "Repoze License",
+            "url": "http://www.repoze.org/LICENSE.txt"
   }, 
-  "python2.7-waitress-1.0.1": {
-    "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
+        "name": "python2.7-colander-1.4"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD-like (http://repoze.org/license.html)"
+            }
+        ],
+        "name": "python2.7-chameleon-2.24"
   }, 
-  "python2.7-wcwidth-0.1.7": {
-    "MIT License": "http://spdx.org/licenses/MIT"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-cssselect-1.0.3"
   }, 
-  "python2.7-ws4py-0.3.5": {
-    "BSD 4-clause \"Original\" or \"Old\" License": "http://spdx.org/licenses/BSD-4-Clause"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-configobj-5.0.6"
   }, 
-  "python2.7-zope.cachedescriptors-4.0.0": {
-    "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-channelstream-0.5.2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-ws4py-0.5.1"
   }, 
-  "python2.7-zope.deprecation-4.1.2": {
-    "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-celery-4.1.1"
   }, 
-  "python2.7-zope.interface-4.1.3": {
-    "Zope Public License 2.1": "http://spdx.org/licenses/ZPL-2.1"
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-babel-1.3"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-authomatic-0.1.0.post1"
   }, 
-  "xz-5.2.2": {
-    "GNU General Public License v2.0 or later": "http://spdx.org/licenses/GPL-2.0+", 
-    "GNU Library General Public License v2.1 or later": "http://spdx.org/licenses/LGPL-2.1+"
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
   }
-}
  No newline at end of file
+        ],
+        "name": "node-grunt-cli-1.2.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "node-bower-1.8.4"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-rhodecode-testdata-0.10.0"
+    }
+]

rhodecode/public/css/tables.less

@@ -1,503 +1,504 b''
 
 // tables.less
 // For use in RhodeCode application tables;
 // see style guide documentation for guidelines.
 
 // TABLES
 
 .rctable,
 table.rctable,
 table.dataTable {
     clear:both;
     width: 100%;
     margin: 0 auto @padding;
     padding: 0;
     vertical-align: baseline;
     line-height:1.5em;
     border: none;
     outline: none;
     border-collapse: collapse;
     border-spacing: 0;
     color: @grey2;
 
     b {
         font-weight: normal;
     }
 
     em {
         font-weight: bold;
         font-style: normal;
     }
 
     th,
     td {
         height: auto;
         max-width: 20%;
         padding: .65em 1em .65em 0;
         vertical-align: middle;
         border-bottom: @border-thickness solid @grey5;
         white-space: normal;
 
         &.td-radio,
         &.td-checkbox {
             padding-right: 0;
             text-align: center;
 
             input {
                 margin: 0 1em;
             }
         }
 
         &.truncate-wrap {
             white-space: nowrap !important;
         }
 
         pre {
             margin: 0;
         }
 
         .show_more {
             height: inherit;
         }
     }
 
     .expired td {
         background-color: @grey7;
     }
 
     .td-radio + .td-owner {
         padding-left: 1em;
     }
 
 
     th {
         text-align: left;
         font-family: @text-semibold;
     }
 
     .hl {
         td {
             background-color: lighten(@alert4,25%);
         }
     }
 
 // Special Data Cell Types
 // See style guide for desciptions and examples.
 
     td {
 
         &.user {
             padding-left: 1em;
         }
 
         &.td-rss {
             width: 20px;
             min-width: 0;
             margin: 0;
         }
 
         &.quick_repo_menu {
             width: 15px;
             text-align: center;
 
             &:hover {
                 background-color: @grey5;
             }
         }
 
         &.td-hash {
             min-width: 80px;
             width: 200px;
 
             .obsolete {
                 text-decoration: line-through;
                 color: lighten(@grey2,25%);
             }
         }
 
         &.td-time {
             width: 160px;
             white-space: nowrap;
         }
 
         &.annotate{
             padding-right: 0;
 
             div.annotatediv{
                 margin: 0 0.7em;
             }
         }
 
         &.tags-col {
             padding-right: 0;
         }
 
         &.td-description {
             min-width: 350px;
 
             &.truncate, .truncate-wrap {
                 white-space: nowrap;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 max-width: 450px;
             }
         }
 
         &.td-componentname {
             white-space: nowrap;
         }
 
         &.td-name {
 
         }
 
         &.td-journalaction {
             min-width: 300px;
 
             .journal_action_params {
                 // waiting for feedback
             }
         }
 
         &.td-active {
             padding-left: .65em;
         }
 
         &.td-url {
             white-space: nowrap;
         }
 
         &.td-comments {
             min-width: 3em;
         }
 
         &.td-buttons {
             padding: .3em 0;
         }
 
         &.td-action {
             // this is for the remove/delete/edit buttons
             padding-right: 0;
             min-width: 95px;
             text-transform: capitalize;
 
             i {
                 display: none;
             }
         }
 
         // TODO: lisa: this needs to be cleaned up with the buttons
         .grid_edit,
         .grid_delete {
             display: inline-block;
             margin: 0 @padding/3 0 0;
             font-family: @text-light;
 
             i {
                 display: none;
             }
         }
 
         .grid_edit + .grid_delete {
             border-left: @border-thickness solid @grey5;
             padding-left: @padding/2;
         }
 
         &.td-compare {
 
             input {
                 margin-right: 1em;
             }
 
             .compare-radio-button {
                 margin: 0 1em 0 0;
             }
 
 
         }
 
         &.td-tags {
             padding: .5em 1em .5em 0;
             width: 140px;
 
             .tag {
                 margin: 1px;
                 float: left;
             }
         }
 
         .icon-svn, .icon-hg, .icon-git {
             font-size: 1.4em;
         }
 
         &.collapse_commit,
         &.expand_commit {
             padding-right: 0;
             padding-left: 1em;
         }
     }
 
     .perm_admin_row {
         color: @grey4;
         background-color: @grey6;
     }
 
     .noborder {
         border: none;
 
         td {
             border: none;
         }
     }
 }
 .rctable.audit-log {
     td {
                 vertical-align: top;
     }
 }
 
 // TRUNCATING
 // TODO: lisaq: should this possibly be moved out of tables.less?
 // for truncated text
 // used inside of table cells and in code block headers
 .truncate-wrap {
     white-space: nowrap !important;
 
     //truncated text
     .truncate {
         max-width: 450px;
         width: 300px;
         overflow: hidden;
         text-overflow: ellipsis;
         -o-text-overflow: ellipsis;
         -ms-text-overflow: ellipsis;
 
         &.autoexpand {
             width: 120px;
             margin-right: 200px;
         }
     }
     &:hover .truncate.autoexpand {
         overflow: visible;
     }
 
     .tags-truncate {
         width: 150px;
         height: 22px;
         overflow: hidden;
 
         .tag {
             display: inline-block;
         }
 
         &.truncate {
             height: 22px;
             max-height:2em;
             width: 140px;
         }
     }
 }
 
 .apikeys_wrap {
     margin-bottom: @padding;
 
     table.rctable td:first-child {
         width: 340px;
     }
 }
 
 
 
 // SPECIAL CASES
 
 // Repository Followers
 table.rctable.followers_data {
     width: 75%;
     margin: 0;
 }
 
 // Repository List
 // Group Members List
 table.rctable.group_members,
 table#repo_list_table {
     min-width: 600px;
 }
 
 // Keyboard mappings
 table.keyboard-mappings {
     th {
         text-align: left;
         font-family: @text-semibold;
     }
 }
 
 // Branches, Tags, and Bookmarks
 #obj_list_table.dataTable {
     td.td-time {
         padding-right: 1em;
     }
 }
 
 // User Admin
 .rctable.useremails,
 .rctable.account_emails {
     .tag,
     .btn {
         float: right;
     }
     .btn { //to line up with tags
         margin-right: 1.65em;
     }
 }
 
 // User List
 #user_list_table {
 
     td.td-user {
         min-width: 100px;
     }
 }
 
 // Pull Request List Table
 #pull_request_list_table.dataTable {
 
     //TODO: lisa: This needs to be removed once the description is adjusted
     //            for using an expand_commit button (see issue 765)
      td {
          vertical-align: middle;
      }
 }
 
 // Settings (no border)
 table.rctable.dl-settings {
     td {
         border: none;
+        vertical-align: baseline;
     }
 }
 
 
 // Statistics
 table.trending_language_tbl {
     width: 100%;
     line-height: 1em;
 
     td div {
         overflow: visible;
     }
 }
 
 .trending_language_tbl, .trending_language_tbl td {
     border: 0;
     margin: 0;
     padding: 0;
     background: transparent;
 }
 
 .trending_language_tbl, .trending_language_tbl tr {
     border-spacing: 0 3px;
 }
 
 .trending_language {
     position: relative;
     width: 100%;
     height: 19px;
     overflow: hidden;
     background-color: @grey6;
 
     span, b{
         position: absolute;
         display: block;
         height: 12px;
         margin-bottom: 0px;
         white-space: pre;
         padding: floor(@basefontsize/4);
         top: 0;
         left: 0;
     }
 
     span{
         color: @text-color;
         z-index: 0;
         min-width: 20px;
     }
 
     b {
         z-index: 1;
         overflow: hidden;
         background-color: @rcblue;
         color: #FFF;
         text-decoration: none;
     }
 
 }
 
 // Changesets
 #changesets.rctable {
 
     // td must be fixed height for graph
     td {
         height: 32px;
         padding: 0 1em 0 0;
         vertical-align: middle;
         white-space: nowrap;
 
         &.td-description {
             white-space: normal;
         }
 
         &.expand_commit {
             padding-right: 0;
         }
     }
 }
 
 // Compare
 table.compare_view_commits {
     margin-top: @space;
 
     td.td-time {
         padding-left: .5em;
     }
 
     // special case to not show hover actions on hidden indicator
     tr.compare_select_hidden:hover {
         cursor: inherit;
 
         td {
             background-color: inherit;
         }
     }
 
     tr:hover {
         cursor: pointer;
 
         td {
             background-color: lighten(@alert4,25%);
         }
     }
 
 
 }
 
 .file_history {
     td.td-actions {
         text-align: right;
     }
 }
 
 
 // Gist List
 #gist_list_table {
     td {
         vertical-align: middle;
 
         div{
             display: inline-block;
             vertical-align: middle;
         }
 
         img{
             vertical-align: middle;
         }
     }
 }

rhodecode/templates/admin/settings/settings_open_source.mako

@@ -1,33 +1,46 b''
+<%def name="show_license(license_data)">
+    % if isinstance(license_data, dict):
+        <a href="${license_data.get('url', "#noUrl")}">${license_data.get('spdxId') or license_data.get('fullName')}</a>
+    % else:
+        ${license_data}
+    % endif
+</%def>
+
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Licenses of Third Party Packages')}</h3>
     </div>
     <div class="panel-body">
         <p>
             RhodeCode Enterprise uses various third party packages, many of them
             provided by the open source community.
         </p>
-
         % if c.opensource_licenses:
             <table class="rctable dl-settings">
                 <thead>
                     <th>Product</th>
                     <th>License</th>
                 </thead>
-                %for product, licenses in c.opensource_licenses.items():
+                % for lib in c.opensource_licenses:
                 <tr>
-                    <td>${product}</td>
+                        <td>${lib["name"]}</td>
                     <td>
-                        ${h.literal(', '.join([
-                        '<a href="%(link)s" title="%(name)s">%(name)s</a>' % {'link':link, 'name':name}
-                        if link else name
-                        for name,link in licenses.items()]))}
+                            <ol>
+                            % if isinstance(lib["license"], list):
+                                % for license_data in lib["license"]:
+                                    <li>${show_license(license_data)}</li>
+                                % endfor
+                            % else:
+                                    <% license_data = lib["license"] %>
+                                    <li>${show_license(license_data)}</li>
+                            % endif
+                            </ol>
                     </td>
                 </tr>
                 %endfor
             </table>
         % endif
     </div>
 </div>
 
 

rhodecode/tests/lib/test_utils.py

@@ -1,445 +1,449 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2018 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import json
 import multiprocessing
 import os
 
 import mock
 import py
 import pytest
 
 from rhodecode.lib import caching_query
 from rhodecode.lib import utils
 from rhodecode.lib.utils2 import md5
 from rhodecode.model import settings
 from rhodecode.model import db
 from rhodecode.model import meta
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.settings import UiSetting, SettingsModel
 from rhodecode.tests.fixture import Fixture
 
 
 fixture = Fixture()
 
 
 def extract_hooks(config):
     """Return a dictionary with the hook entries of the given config."""
     hooks = {}
     config_items = config.serialize()
     for section, name, value in config_items:
         if section != 'hooks':
             continue
         hooks[name] = value
 
     return hooks
 
 
 def disable_hooks(request, hooks):
     """Disables the given hooks from the UI settings."""
     session = meta.Session()
 
     model = SettingsModel()
     for hook_key in hooks:
         sett = model.get_ui_by_key(hook_key)
         sett.ui_active = False
         session.add(sett)
 
     # Invalidate cache
     ui_settings = session.query(db.RhodeCodeUi).options(
         caching_query.FromCache('sql_cache_short', 'get_hg_ui_settings'))
     ui_settings.invalidate()
 
     ui_settings = session.query(db.RhodeCodeUi).options(
         caching_query.FromCache('sql_cache_short', 'get_hook_settings'))
     ui_settings.invalidate()
 
     @request.addfinalizer
     def rollback():
         session.rollback()
 
 
 HOOK_PRE_PUSH = db.RhodeCodeUi.HOOK_PRE_PUSH
 HOOK_PRETX_PUSH = db.RhodeCodeUi.HOOK_PRETX_PUSH
 HOOK_PUSH = db.RhodeCodeUi.HOOK_PUSH
 HOOK_PRE_PULL = db.RhodeCodeUi.HOOK_PRE_PULL
 HOOK_PULL = db.RhodeCodeUi.HOOK_PULL
 HOOK_REPO_SIZE = db.RhodeCodeUi.HOOK_REPO_SIZE
 HOOK_PUSH_KEY = db.RhodeCodeUi.HOOK_PUSH_KEY
 
 HG_HOOKS = frozenset(
     (HOOK_PRE_PULL, HOOK_PULL, HOOK_PRE_PUSH, HOOK_PRETX_PUSH, HOOK_PUSH,
      HOOK_REPO_SIZE, HOOK_PUSH_KEY))
 
 
 @pytest.mark.parametrize('disabled_hooks,expected_hooks', [
     ([], HG_HOOKS),
     (HG_HOOKS, []),
 
     ([HOOK_PRE_PUSH, HOOK_PRETX_PUSH, HOOK_REPO_SIZE, HOOK_PUSH_KEY], [HOOK_PRE_PULL, HOOK_PULL, HOOK_PUSH]),
 
     # When a pull/push hook is disabled, its pre-pull/push counterpart should
     # be disabled too.
     ([HOOK_PUSH], [HOOK_PRE_PULL, HOOK_PULL, HOOK_REPO_SIZE]),
     ([HOOK_PULL], [HOOK_PRE_PUSH, HOOK_PRETX_PUSH, HOOK_PUSH, HOOK_REPO_SIZE,
                    HOOK_PUSH_KEY]),
 ])
 def test_make_db_config_hg_hooks(baseapp, request, disabled_hooks,
                                  expected_hooks):
     disable_hooks(request, disabled_hooks)
 
     config = utils.make_db_config()
     hooks = extract_hooks(config)
 
     assert set(hooks.iterkeys()).intersection(HG_HOOKS) == set(expected_hooks)
 
 
 @pytest.mark.parametrize('disabled_hooks,expected_hooks', [
     ([], ['pull', 'push']),
     ([HOOK_PUSH], ['pull']),
     ([HOOK_PULL], ['push']),
     ([HOOK_PULL, HOOK_PUSH], []),
 ])
 def test_get_enabled_hook_classes(disabled_hooks, expected_hooks):
     hook_keys = (HOOK_PUSH, HOOK_PULL)
     ui_settings = [
         ('hooks', key, 'some value', key not in disabled_hooks)
         for key in hook_keys]
 
     result = utils.get_enabled_hook_classes(ui_settings)
     assert sorted(result) == expected_hooks
 
 
 def test_get_filesystem_repos_finds_repos(tmpdir, baseapp):
     _stub_git_repo(tmpdir.ensure('repo', dir=True))
     repos = list(utils.get_filesystem_repos(str(tmpdir)))
     assert repos == [('repo', ('git', tmpdir.join('repo')))]
 
 
 def test_get_filesystem_repos_skips_directories(tmpdir, baseapp):
     tmpdir.ensure('not-a-repo', dir=True)
     repos = list(utils.get_filesystem_repos(str(tmpdir)))
     assert repos == []
 
 
 def test_get_filesystem_repos_skips_directories_with_repos(tmpdir, baseapp):
     _stub_git_repo(tmpdir.ensure('subdir/repo', dir=True))
     repos = list(utils.get_filesystem_repos(str(tmpdir)))
     assert repos == []
 
 
 def test_get_filesystem_repos_finds_repos_in_subdirectories(tmpdir, baseapp):
     _stub_git_repo(tmpdir.ensure('subdir/repo', dir=True))
     repos = list(utils.get_filesystem_repos(str(tmpdir), recursive=True))
     assert repos == [('subdir/repo', ('git', tmpdir.join('subdir', 'repo')))]
 
 
 def test_get_filesystem_repos_skips_names_starting_with_dot(tmpdir):
     _stub_git_repo(tmpdir.ensure('.repo', dir=True))
     repos = list(utils.get_filesystem_repos(str(tmpdir)))
     assert repos == []
 
 
 def test_get_filesystem_repos_skips_files(tmpdir):
     tmpdir.ensure('test-file')
     repos = list(utils.get_filesystem_repos(str(tmpdir)))
     assert repos == []
 
 
 def test_get_filesystem_repos_skips_removed_repositories(tmpdir):
     removed_repo_name = 'rm__00000000_000000_000000__.stub'
     assert utils.REMOVED_REPO_PAT.match(removed_repo_name)
     _stub_git_repo(tmpdir.ensure(removed_repo_name, dir=True))
     repos = list(utils.get_filesystem_repos(str(tmpdir)))
     assert repos == []
 
 
 def _stub_git_repo(repo_path):
     """
     Make `repo_path` look like a Git repository.
     """
     repo_path.ensure('.git', dir=True)
 
 
 @pytest.mark.parametrize('str_class', [str, unicode], ids=['str', 'unicode'])
 def test_get_dirpaths_returns_all_paths(tmpdir, str_class):
     tmpdir.ensure('test-file')
     dirpaths = utils._get_dirpaths(str_class(tmpdir))
     assert dirpaths == ['test-file']
 
 
 def test_get_dirpaths_returns_all_paths_bytes(
         tmpdir, platform_encodes_filenames):
     if platform_encodes_filenames:
         pytest.skip("This platform seems to encode filenames.")
     tmpdir.ensure('repo-a-umlaut-\xe4')
     dirpaths = utils._get_dirpaths(str(tmpdir))
     assert dirpaths == ['repo-a-umlaut-\xe4']
 
 
 def test_get_dirpaths_skips_paths_it_cannot_decode(
         tmpdir, platform_encodes_filenames):
     if platform_encodes_filenames:
         pytest.skip("This platform seems to encode filenames.")
     path_with_latin1 = 'repo-a-umlaut-\xe4'
     tmpdir.ensure(path_with_latin1)
     dirpaths = utils._get_dirpaths(unicode(tmpdir))
     assert dirpaths == []
 
 
 @pytest.fixture(scope='session')
 def platform_encodes_filenames():
     """
     Boolean indicator if the current platform changes filename encodings.
     """
     path_with_latin1 = 'repo-a-umlaut-\xe4'
     tmpdir = py.path.local.mkdtemp()
     tmpdir.ensure(path_with_latin1)
     read_path = tmpdir.listdir()[0].basename
     tmpdir.remove()
     return path_with_latin1 != read_path
 
 
 
 
 def test_repo2db_mapper_groups(repo_groups):
     session = meta.Session()
     zombie_group, parent_group, child_group = repo_groups
     zombie_path = os.path.join(
         RepoGroupModel().repos_path, zombie_group.full_path)
     os.rmdir(zombie_path)
 
     # Avoid removing test repos when calling repo2db_mapper
     repo_list = {
         repo.repo_name: 'test' for repo in session.query(db.Repository).all()
     }
     utils.repo2db_mapper(repo_list, remove_obsolete=True)
 
     groups_in_db = session.query(db.RepoGroup).all()
     assert child_group in groups_in_db
     assert parent_group in groups_in_db
     assert zombie_path not in groups_in_db
 
 
 def test_repo2db_mapper_enables_largefiles(backend):
     repo = backend.create_repo()
     repo_list = {repo.repo_name: 'test'}
     with mock.patch('rhodecode.model.db.Repository.scm_instance') as scm_mock:
         utils.repo2db_mapper(repo_list, remove_obsolete=False)
         _, kwargs = scm_mock.call_args
         assert kwargs['config'].get('extensions', 'largefiles') == ''
 
 
 @pytest.mark.backends("git", "svn")
 def test_repo2db_mapper_installs_hooks_for_repos_in_db(backend):
     repo = backend.create_repo()
     repo_list = {repo.repo_name: 'test'}
     utils.repo2db_mapper(repo_list, remove_obsolete=False)
 
 
 @pytest.mark.backends("git", "svn")
 def test_repo2db_mapper_installs_hooks_for_newly_added_repos(backend):
     repo = backend.create_repo()
     RepoModel().delete(repo, fs_remove=False)
     meta.Session().commit()
     repo_list = {repo.repo_name: repo.scm_instance()}
     utils.repo2db_mapper(repo_list, remove_obsolete=False)
 
 
 class TestPasswordChanged(object):
     def setup(self):
         self.session = {
             'rhodecode_user': {
                 'password': '0cc175b9c0f1b6a831c399e269772661'
             }
         }
         self.auth_user = mock.Mock()
         self.auth_user.userame = 'test'
         self.auth_user.password = 'abc123'
 
     def test_returns_false_for_default_user(self):
         self.auth_user.username = db.User.DEFAULT_USER
         result = utils.password_changed(self.auth_user, self.session)
         assert result is False
 
     def test_returns_false_if_password_was_not_changed(self):
         self.session['rhodecode_user']['password'] = md5(
             self.auth_user.password)
         result = utils.password_changed(self.auth_user, self.session)
         assert result is False
 
     def test_returns_true_if_password_was_changed(self):
         result = utils.password_changed(self.auth_user, self.session)
         assert result is True
 
     def test_returns_true_if_auth_user_password_is_empty(self):
         self.auth_user.password = None
         result = utils.password_changed(self.auth_user, self.session)
         assert result is True
 
     def test_returns_true_if_session_password_is_empty(self):
         self.session['rhodecode_user'].pop('password')
         result = utils.password_changed(self.auth_user, self.session)
         assert result is True
 
 
-class TestReadOpensourceLicenses(object):
+class TestReadOpenSourceLicenses(object):
     def test_success(self):
         utils._license_cache = None
         json_data = '''
         {
             "python2.7-pytest-2.7.1": {"UNKNOWN": null},
             "python2.7-Markdown-2.6.2": {
                 "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
             }
         }
         '''
         resource_string_patch = mock.patch.object(
             utils.pkg_resources, 'resource_string', return_value=json_data)
         with resource_string_patch:
             result = utils.read_opensource_licenses()
         assert result == json.loads(json_data)
 
     def test_caching(self):
         utils._license_cache = {
             "python2.7-pytest-2.7.1": {
                 "UNKNOWN": None
             },
             "python2.7-Markdown-2.6.2": {
                 "BSD-3-Clause": "http://spdx.org/licenses/BSD-3-Clause"
             }
         }
         resource_patch = mock.patch.object(
             utils.pkg_resources, 'resource_string', side_effect=Exception)
         json_patch = mock.patch.object(
             utils.json, 'loads', side_effect=Exception)
 
         with resource_patch as resource_mock, json_patch as json_mock:
             result = utils.read_opensource_licenses()
 
         assert resource_mock.call_count == 0
         assert json_mock.call_count == 0
         assert result == utils._license_cache
 
     def test_licenses_file_contains_no_unknown_licenses(self):
         utils._license_cache = None
         result = utils.read_opensource_licenses()
-        license_names = []
-        for licenses in result.values():
-            license_names.extend(licenses.keys())
-        assert 'UNKNOWN' not in license_names
+
+        for license_data in result:
+            if isinstance(license_data["license"], list):
+                for lic_data in license_data["license"]:
+                    assert 'UNKNOWN' not in lic_data["fullName"]
+            else:
+                full_name = license_data.get("fullName") or license_data
+                assert 'UNKNOWN' not in full_name
 
 
 class TestMakeDbConfig(object):
     def test_data_from_config_data_from_db_returned(self):
         test_data = [
             ('section1', 'option1', 'value1'),
             ('section2', 'option2', 'value2'),
             ('section3', 'option3', 'value3'),
         ]
         with mock.patch.object(utils, 'config_data_from_db') as config_mock:
             config_mock.return_value = test_data
             kwargs = {'clear_session': False, 'repo': 'test_repo'}
             result = utils.make_db_config(**kwargs)
         config_mock.assert_called_once_with(**kwargs)
         for section, option, expected_value in test_data:
             value = result.get(section, option)
             assert value == expected_value
 
 
 class TestConfigDataFromDb(object):
     def test_config_data_from_db_returns_active_settings(self):
         test_data = [
             UiSetting('section1', 'option1', 'value1', True),
             UiSetting('section2', 'option2', 'value2', True),
             UiSetting('section3', 'option3', 'value3', False),
         ]
         repo_name = 'test_repo'
 
         model_patch = mock.patch.object(settings, 'VcsSettingsModel')
         hooks_patch = mock.patch.object(
             utils, 'get_enabled_hook_classes',
             return_value=['pull', 'push', 'repo_size'])
         with model_patch as model_mock, hooks_patch:
             instance_mock = mock.Mock()
             model_mock.return_value = instance_mock
             instance_mock.get_ui_settings.return_value = test_data
             result = utils.config_data_from_db(
                 clear_session=False, repo=repo_name)
 
         self._assert_repo_name_passed(model_mock, repo_name)
 
         expected_result = [
             ('section1', 'option1', 'value1'),
             ('section2', 'option2', 'value2'),
         ]
         assert result == expected_result
 
     def _assert_repo_name_passed(self, model_mock, repo_name):
         assert model_mock.call_count == 1
         call_args, call_kwargs = model_mock.call_args
         assert call_kwargs['repo'] == repo_name
 
 
 class TestIsDirWritable(object):
     def test_returns_false_when_not_writable(self):
         with mock.patch('__builtin__.open', side_effect=OSError):
             assert not utils._is_dir_writable('/stub-path')
 
     def test_returns_true_when_writable(self, tmpdir):
         assert utils._is_dir_writable(str(tmpdir))
 
     def test_is_safe_against_race_conditions(self, tmpdir):
         workers = multiprocessing.Pool()
         directories = [str(tmpdir)] * 10
         workers.map(utils._is_dir_writable, directories)
 
 
 class TestGetEnabledHooks(object):
     def test_only_active_hooks_are_enabled(self):
         ui_settings = [
             UiSetting('hooks', db.RhodeCodeUi.HOOK_PUSH, 'value', True),
             UiSetting('hooks', db.RhodeCodeUi.HOOK_REPO_SIZE, 'value', True),
             UiSetting('hooks', db.RhodeCodeUi.HOOK_PULL, 'value', False)
         ]
         result = utils.get_enabled_hook_classes(ui_settings)
         assert result == ['push', 'repo_size']
 
     def test_all_hooks_are_enabled(self):
         ui_settings = [
             UiSetting('hooks', db.RhodeCodeUi.HOOK_PUSH, 'value', True),
             UiSetting('hooks', db.RhodeCodeUi.HOOK_REPO_SIZE, 'value', True),
             UiSetting('hooks', db.RhodeCodeUi.HOOK_PULL, 'value', True)
         ]
         result = utils.get_enabled_hook_classes(ui_settings)
         assert result == ['push', 'repo_size', 'pull']
 
     def test_no_enabled_hooks_when_no_hook_settings_are_found(self):
         ui_settings = []
         result = utils.get_enabled_hook_classes(ui_settings)
         assert result == []
 
 
 def test_obfuscate_url_pw():
     from rhodecode.lib.utils2 import obfuscate_url_pw
     engine = u'/home/repos/malmö'
     assert obfuscate_url_pw(engine)
  No newline at end of file