Commit 8b472f27 authored by Matthew Noorenberghe's avatar Matthew Noorenberghe
Browse files

Bug 1648858 - Allow BSD-3-Clause, CC0-1.0, Unlicense, WTFPL, & Zlib licenses in moz.yaml. r=mhoye 

Remove GPL-3.0 since it-alone isn't allowed.

Licensing runbook: https://docs.google.com/document/d/1Oguqp43W4_ChyroJ9AJAzG1jSwkUWfKvBKVvrDxVsMg/edit

Differential Revision: https://phabricator.services.mozilla.com/D81436
parent b55265d6

python/mozbuild/mozbuild/vendor/moz_yaml.py

+6 −2
Original line number Diff line number Diff line
@@ -40,8 +40,9 @@ VALID_LICENSES = [ 
    # Standard Licenses (as per https://spdx.org/licenses/)

    "Apache-2.0",

    "BSD-2-Clause",

    "BSD-3-Clause",

    "BSD-3-Clause-Clear",

    "GPL-3.0",

    "CC0-1.0",

    "ISC",

    "ICU",

    "LGPL-2.1",
@@ -49,6 +50,9 @@ VALID_LICENSES = [ 
    "MIT",

    "MPL-1.1",

    "MPL-2.0",

    "Unlicense",

    "WTFPL",

    "Zlib",

    # Unique Licenses

    "ACE",  # http://www.cs.wustl.edu/~schmidt/ACE-copying.html

    "Anti-Grain-Geometry",  # http://www.antigrain.com/license/index.html
@@ -452,7 +456,7 @@ class UpdateActions(object): 


class License(object):

    """Voluptuous validator which verifies the license(s) are valid as per our

    whitelist."""

    allow list."""



    def __call__(self, values):

        if isinstance(values, str):