From f586cb1a2be708a03fb8dc495e1b420911d86f64 Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 3 Sep 2020 12:21:49 -0600 Subject: [PATCH 1/5] DOC: better license specification in README --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0928c6386..ccccaadc2 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This repository is used to manage the process of adding nominees for considerati 1. Go to the [nominees](https://github.com/unicef/publicgoods-candidates/tree/master/nominees) folder, and click on `Create new file` 2. Name the new file with the name of the digital public good in [kebab-case](https://wiki.c2.com/?KebabCase), and `.json` as the extension. For example: [wikipedia.json](https://github.com/unicef/publicgoods-candidates/blob/master/nominees/wikipedia.json) or [inlcusion-ukr.json](https://github.com/unicef/publicgoods-candidates/blob/master/nominees/inclusion-ukr.json) -3. Use the [template](https://github.com/unicef/publicgoods-candidates#template) from the section below to include the requested information. Be sure to include the fields marked `REQUIRED` with the corresponding information, as well as any `OPTIONAL` fields. Delete any lines marked `OPTIONAL` that you don't want to include. For the `license` field, be sure to use an approved [SPDX identifier](https://spdx.github.io/spdx-spec/appendix-I-SPDX-license-list/#i1-licenses-with-short-identifiers). +3. Use the [template](https://github.com/unicef/publicgoods-candidates#template) from the section below to include the requested information. Be sure to include the fields marked `REQUIRED` with the corresponding information, as well as any `OPTIONAL` fields. Delete any lines marked `OPTIONAL` that you don't want to include. For the `license` field, refer to the [Specifying Licenses](#specifying-licenses) section for the list of approved licenses. 4. Scroll down and accept the suggested field for the commit message `Create `, and choose `Create a new branch for this commit and start a pull request`. Click on `Propose new file` 5. You are taken to a new page where you can leave a comment about the file you are about to propose to add, and finally click on `Create Pull Request` 6. Wait for the green checkmark to say `All checks have passed` to have confirmation that the file complies with the expected format, and is ready to merge pending a review. @@ -46,6 +46,16 @@ This repository is used to manage the process of adding nominees for considerati } ``` +### Specifying Licenses + +Licenses for open source software, open content and open data are vetted and approved by third party organizations, and we rely on their criteria in order to include them in our list of approved licenses. On top of it, we use [SPDX identifiers](https://spdx.org/licenses/) to easily, efficiently and uniquely refer to each license. + +* **Open Content**: you are encouraged to use one of the Creative Commons licenses which allow for both derivatives and commercial reuse: [CC BY](https://creativecommons.org/licenses/by/4.0/) or [CC BY-SA](https://creativecommons.org/licenses/by-sa/4.0/), or dedicate content to the public domain ([CC0](https://creativecommons.org/share-your-work/public-domain/cc0/)). We also accept the following licenses which do not allow for commercial reuse: [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/) and [CC-BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/). +* **Open Data**: only accepting [conformant licenses](https://opendefinition.org/licenses/) to the Open Definition from the Open Data Commons. +* **Open Source Software**: only accepting [approved licenses](https://opensource.org/licenses) from the Open Source Initiative. + +Refer to the [current list of approved licenses](/docs/licenses.md) for additional information. + ### Specifying SDGs In order to make it easy for downstream projects to process data from the SDGs field, data must comply to the following format (you must select one or more elements of the following array, where an element is defined by a `number` and `string` pair): From fce1c81de7f40ea0c6763c3f116015c506f682a8 Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 3 Sep 2020 13:06:03 -0600 Subject: [PATCH 2/5] DOC: Combined list of all approved licenses --- docs/licenses.md | 298 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 298 insertions(+) create mode 100644 docs/licenses.md diff --git a/docs/licenses.md b/docs/licenses.md new file mode 100644 index 000000000..ceb8fb576 --- /dev/null +++ b/docs/licenses.md @@ -0,0 +1,298 @@ +# Approved Licenses for Digital Public Goods + +Licenses for open source software, open content and open data are vetted and approved by third party organizations, and we rely on their criteria in order to include them in our list of approved licenses. On top of it, we use [SPDX identifiers](https://spdx.org/licenses/) to easily, efficiently and uniquely refer to each license. + +* **Open Content**: you are encouraged to use one of the Creative Commons licenses which allow for both derivatives and commercial reuse: [CC BY](https://creativecommons.org/licenses/by/4.0/) or [CC BY-SA](https://creativecommons.org/licenses/by-sa/4.0/), or dedicate content to the public domain ([CC0](https://creativecommons.org/share-your-work/public-domain/cc0/)). We also accept the following licenses which do not allow for commercial reuse: [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/) and [CC-BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/). +* **Open Data**: only accepting [conformant licenses](https://opendefinition.org/licenses/) to the Open Definition from the Open Data Commons. +* **Open Source Software**: only accepting [approved licenses](https://opensource.org/licenses) from the Open Source Initiative. + +The full list of licenses is included below. + +## Content + +Full Name | SPDX Identifier +--- | --- +CC-BY-1.0 | Creative Commons Attribution 1.0 Generic +CC-BY-2.0 | Creative Commons Attribution 2.0 Generic +CC-BY-2.5 | Creative Commons Attribution 2.5 Generic +CC-BY-3.0 | Creative Commons Attribution 3.0 Unported +CC-BY-3.0-AT | Creative Commons Attribution 3.0 Austria +CC-BY-4.0 | Creative Commons Attribution 4.0 International +CC-BY-NC-1.0 | Creative Commons Attribution Non Commercial 1.0 Generic +CC-BY-NC-2.0 | Creative Commons Attribution Non Commercial 2.0 Generic +CC-BY-NC-2.5 | Creative Commons Attribution Non Commercial 2.5 Generic +CC-BY-NC-3.0 | Creative Commons Attribution Non Commercial 3.0 Unported +CC-BY-NC-4.0 | Creative Commons Attribution Non Commercial 4.0 International +CC-BY-NC-SA-1.0 | Creative Commons Attribution Non Commercial Share Alike 1.0 Generic +CC-BY-NC-SA-2.0 | Creative Commons Attribution Non Commercial Share Alike 2.0 Generic +CC-BY-NC-SA-2.5 | Creative Commons Attribution Non Commercial Share Alike 2.5 Generic +CC-BY-NC-SA-3.0 | Creative Commons Attribution Non Commercial Share Alike 3.0 Unported +CC-BY-NC-SA-4.0 | Creative Commons Attribution Non Commercial Share Alike 4.0 International +CC-BY-SA-1.0 | Creative Commons Attribution Share Alike 1.0 Generic +CC-BY-SA-2.0 | Creative Commons Attribution Share Alike 2.0 Generic +CC-BY-SA-2.5 | Creative Commons Attribution Share Alike 2.5 Generic +CC-BY-SA-3.0 | Creative Commons Attribution Share Alike 3.0 Unported +CC-BY-SA-3.0-AT | Creative Commons Attribution Share Alike 3.0 Austria +CC-BY-SA-4.0 | Creative Commons Attribution Share Alike 4.0 International +CC0-1.0 | Creative Commons Zero v1.0 Universal + +## Data + +Full Name | SPDX Identifier +--- | --- +CC-BY-4.0 | Creative Commons Attribution 4.0 International +CC-BY-SA-4.0 | Creative Commons Attribution Share-Alike 4.0 International +CC0-1.0 | Creative Commons Zero v1.0 Universal +ODbL-1.0 | Open Data Commons Open Database License 1.0 +ODC-By-1.0 | Open Data Commons Attribution License 1.0 +PDDL-1.0 | Open Data Commons Public Domain Dedication and Licence 1.0 + +## Software + +Full Name | SPDX Identifier +-- | -- +0BSD|0-clause BSD License +AAL|Attribution Assurance License +AFL-3.0|Academic Free License 3.0 +AGPL-3.0-only|GNU Affero General Public License version 3 only +AGPL-3.0-or-later|GNU Affero General Public License version 3 or later +Apache-1.1|Apache Software License 1.1 +Apache-2.0|Apache License 2.0 +APL-1.0|Adaptive Public License +APSL-2.0|Apple Public Source License +Artistic-1.0|Artistic license 1.0 +Artistic-2.0|Artistic License 2.0 +BSD-1-Clause|1-clause BSD License +BSD-2-Clause|2-clause BSD License +BSD-2-Clause-Patent|BSD+Patent +BSD-3-Clause|3-clause BSD License +BSD-3-Clause-LBNL|BSD-3-Clause-LBNL +BSL-1.0|Boost Software License +CAL-1.0|Cryptographic Autonomy License v.1.0 +CAL-1.0-Combined-Work-Exception|Cryptographic Autonomy License v.1.0 +CATOSL-1.1|Computer Associates Trusted Open Source License 1.1 +CDDL-1.0|Common Development and Distribution License 1.0 +CECILL-2.1|CeCILL License 2.1 +CNRI-Python|CNRI Python license +CPAL-1.0|Common Public Attribution License 1.0 +CPL-1.0|Common Public License 1.0 +ECL-1.0|Educational Community License, Version 1.0 +ECL-2.0|Educational Community License, Version 2.0 +EFL-1.0|Eiffel Forum License V1.0 +EFL-2.0|Eiffel Forum License V2.0 +Entessa|Entessa Public License +EPL-1.0|Eclipse Public License 1.0 +EPL-2.0|Eclipse Public License 2.0 +EUDatagrid|EU DataGrid Software License +EUPL-1.2|European Union Public License 1.2 +Fair|Fair License +Frameworx-1.0|Frameworx License +GPL-2.0-only|GNU General Public License version 2 only +GPL-2.0-or-later|GNU General Public License version 2 or later +GPL-3.0-only|GNU General Public License version 3 only +GPL-3.0-or-later|GNU General Public License version 3 or later +HPND|Historical Permission Notice and Disclaimer +IPA|IPA Font License +IPL-1.0|IBM Public License 1.0 +ISC|ISC License +LGPL-2.1-only|GNU Lesser General Public License version 2.1 only +LGPL-2.1-or-later|GNU Lesser General Public License version 2.1 or later +LGPL-3.0-only|GNU Lesser General Public License version 3 only +LGPL-3.0-or-later|GNU Lesser General Public License version 3 or later +LiLiQ-P-1.1|Licence Libre du Québec – Permissive +LiLiQ-R-1.1|Licence Libre du Québec – Réciprocité +LiLiQ-Rplus-1.1|Licence Libre du Québec – Réciprocité forte +LPL-1.0|Lucent Public License +LPL-1.02|Lucent Public License Version 1.02 +LPPL-1.3c|LaTeX Project Public License 1.3c +MirOS|MirOS Licence +MIT|MIT License +MIT-0|MIT No Attribution License +Motosoto|Motosoto License +MPL-1.0|Mozilla Public License 1.0 +MPL-1.1|Mozilla Public License 1.1 +MPL-2.0|Mozilla Public License 2.0 +MPL-2.0-no-copyleft-exception|Mozilla Public License 2.0, no copyleft exception +MS-PL|Microsoft Public License +MS-RL|Microsoft Reciprocal License +MulanPSL-2.0|Mulan Permissive Software License v2 +Multics|Multics License +NASA-1.3|NASA Open Source Agreement 1.3 +Naumen|Naumen Public License +NCSA|University of Illinois/NCSA Open Source License +NGPL|Nethack General Public License +Nokia|Nokia Open Source License +NPOSL-3.0|Non-Profit Open Software License 3.0 +NTP|NTP License +OCLC-2.0|OCLC Research Public License 2.0 +OFL-1.1|SIL Open Font License 1.1 +OFL-1.1-no-RFN|SIL Open Font License 1.1 +OFL-1.1-RFN|SIL Open Font License 1.1 +OGTSL|Open Group Test Suite License +OLDAP-2.8|OpenLDAP Public License Version 2.8 +OSET-PL-2.1|OSET Public License version 2.1 +OSL-1.0|Open Software License 1.0 +OSL-2.1|Open Software License 2.1 +OSL-3.0|Open Software License 3.0 +PHP-3.0|PHP License 3.0 +PHP-3.01|PHP License 3.01 +PostgreSQL|The PostgreSQL License +Python-2.0|Python License +QPL-1.0|Q Public License +RPL-1.1|Reciprocal Public License, version 1.1 +RPL-1.5|Reciprocal Public License 1.5 +RPSL-1.0|RealNetworks Public Source License V1.0 +RSCPL|Ricoh Source Code Public License +SimPL-2.0|Simple Public License 2.0 +Sleepycat|Sleepycat License +SPL-1.0|Sun Public License 1.0 +UCL-1.0|Upstream Compatibility License v1.0 +Unicode-DFS-2015|Unicode Data Files and Software License +Unicode-DFS-2016|Unicode Data Files and Software License +Unlicense|The Unlicense +UPL-1.0|Universal Permissive License +VSL-1.0|Vovida Software License v. 1.0 +W3C|W3C License +Watcom-1.0|Sybase Open Watcom Public License 1.0 +Xnet|X.Net License +wxWindows|wxWindows Library License +Zlib|zlib/libpng license +ZPL-2.0|Zope Public License 2.0 + +## Combined raw list, sorted alphabetically + +``` +0BSD +AAL +AFL-3.0 +AGPL-3.0-only +AGPL-3.0-or-later +Apache-1.1 +Apache-2.0 +APL-1.0 +APSL-2.0 +Artistic-1.0 +Artistic-2.0 +BSD-1-Clause +BSD-2-Clause +BSD-2-Clause-Patent +BSD-3-Clause +BSD-3-Clause-LBNL +BSL-1.0 +CAL-1.0 +CAL-1.0-Combined-Work-Exception +CATOSL-1.1 +CC-BY-1.0 +CC-BY-2.0 +CC-BY-2.5 +CC-BY-3.0 +CC-BY-3.0-AT +CC-BY-4.0 +CC-BY-NC-1.0 +CC-BY-NC-2.0 +CC-BY-NC-2.5 +CC-BY-NC-3.0 +CC-BY-NC-4.0 +CC-BY-NC-SA-1.0 +CC-BY-NC-SA-2.0 +CC-BY-NC-SA-2.5 +CC-BY-NC-SA-3.0 +CC-BY-NC-SA-4.0 +CC-BY-SA-1.0 +CC-BY-SA-2.0 +CC-BY-SA-2.5 +CC-BY-SA-3.0 +CC-BY-SA-3.0-AT +CC-BY-SA-4.0 +CC0-1.0 +CDDL-1.0 +CECILL-2.1 +CNRI-Python +CPAL-1.0 +CPL-1.0 +ECL-1.0 +ECL-2.0 +EFL-1.0 +EFL-2.0 +Entessa +EPL-1.0 +EPL-2.0 +EUDatagrid +EUPL-1.2 +Fair +Frameworx-1.0 +GPL-2.0-only +GPL-2.0-or-later +GPL-3.0-only +GPL-3.0-or-later +HPND +IPA +IPL-1.0 +ISC +LGPL-2.1-only +LGPL-2.1-or-later +LGPL-3.0-only +LGPL-3.0-or-later +LiLiQ-P-1.1 +LiLiQ-R-1.1 +LiLiQ-Rplus-1.1 +LPL-1.0 +LPL-1.02 +LPPL-1.3c +MirOS +MIT +MIT-0 +Motosoto +MPL-1.0 +MPL-1.1 +MPL-2.0 +MPL-2.0-no-copyleft-exception +MS-PL +MS-RL +MulanPSL-2.0 +Multics +NASA-1.3 +Naumen +NCSA +NGPL +Nokia +NPOSL-3.0 +NTP +OCLC-2.0 +ODbL-1.0 +ODC-By-1.0 +OFL-1.1 +OFL-1.1-no-RFN +OFL-1.1-RFN +OGTSL +OLDAP-2.8 +OSET-PL-2.1 +OSL-1.0 +OSL-2.1 +OSL-3.0 +PDDL-1.0 +PHP-3.0 +PHP-3.01 +PostgreSQL +Python-2.0 +QPL-1.0 +RPL-1.1 +RPL-1.5 +RPSL-1.0 +RSCPL +SimPL-2.0 +Sleepycat +SPL-1.0 +UCL-1.0 +Unicode-DFS-2015 +Unicode-DFS-2016 +Unlicense +UPL-1.0 +VSL-1.0 +W3C +Watcom-1.0 +Xnet +wxWindows +Zlib +ZPL-2.0 +``` From fd50d1dc67053284b9783b748fda9179cdc3a2dc Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 3 Sep 2020 13:21:30 -0600 Subject: [PATCH 3/5] BLD: Updated list of approved licenses --- nominee-schema.json | 244 +++++--------------------------------------- 1 file changed, 27 insertions(+), 217 deletions(-) diff --git a/nominee-schema.json b/nominee-schema.json index 46265e125..d8f70fb40 100644 --- a/nominee-schema.json +++ b/nominee-schema.json @@ -51,328 +51,138 @@ "enum": [ "0BSD", "AAL", - "Abstyles", - "Adobe-2006", - "Adobe-Glyph", - "ADSL", - "AFL-1.1", - "AFL-1.2", - "AFL-2.0", - "AFL-2.1", "AFL-3.0", - "Afmparse", - "AGPL-1.0", - "AGPL-3.0", - "Aladdin", - "AMDPLPA", - "AML", - "AMPAS", - "ANTLR-PD", - "Apache-1.0", + "AGPL-3.0-only", + "AGPL-3.0-or-later", "Apache-1.1", "Apache-2.0", - "APAFML", "APL-1.0", - "APSL-1.0", - "APSL-1.1", - "APSL-1.2", "APSL-2.0", "Artistic-1.0", - "Artistic-1.0-cl8", - "Artistic-1.0-Perl", "Artistic-2.0", - "Bahyph", - "Barr", - "Beerware", - "BitTorrent-1.0", - "BitTorrent-1.1", - "Borceux", + "BSD-1-Clause", "BSD-2-Clause", - "BSD-2-Clause-FreeBSD", - "BSD-2-Clause-NetBSD", + "BSD-2-Clause-Patent", "BSD-3-Clause", - "BSD-3-Clause-Attribution", - "BSD-3-Clause-Clear", "BSD-3-Clause-LBNL", - "BSD-3-Clause-No-Nuclear-License", - "BSD-3-Clause-No-Nuclear-License-2014", - "BSD-3-Clause-No-Nuclear-Warranty", - "BSD-4-Clause", - "BSD-4-Clause-UC", - "BSD-Protection", - "BSD-Source-Code", "BSL-1.0", - "bzip2-1.0.5", - "bzip2-1.0.6", - "Caldera", + "CAL-1.0", + "CAL-1.0-Combined-Work-Exception", "CATOSL-1.1", "CC-BY-1.0", "CC-BY-2.0", "CC-BY-2.5", "CC-BY-3.0", + "CC-BY-3.0-AT", "CC-BY-4.0", "CC-BY-NC-1.0", "CC-BY-NC-2.0", "CC-BY-NC-2.5", "CC-BY-NC-3.0", "CC-BY-NC-4.0", - "CC-BY-NC-ND-1.0", - "CC-BY-NC-ND-2.0", - "CC-BY-NC-ND-2.5", - "CC-BY-NC-ND-3.0", - "CC-BY-NC-ND-4.0", "CC-BY-NC-SA-1.0", "CC-BY-NC-SA-2.0", "CC-BY-NC-SA-2.5", "CC-BY-NC-SA-3.0", "CC-BY-NC-SA-4.0", - "CC-BY-ND-1.0", - "CC-BY-ND-2.0", - "CC-BY-ND-2.5", - "CC-BY-ND-3.0", - "CC-BY-ND-4.0", "CC-BY-SA-1.0", "CC-BY-SA-2.0", "CC-BY-SA-2.5", "CC-BY-SA-3.0", + "CC-BY-SA-3.0-AT", "CC-BY-SA-4.0", "CC0-1.0", "CDDL-1.0", - "CDDL-1.1", - "CECILL-1.0", - "CECILL-1.1", - "CECILL-2.0", "CECILL-2.1", - "CECILL-B", - "CECILL-C", - "ClArtistic", - "CNRI-Jython", "CNRI-Python", - "CNRI-Python-GPL-Compatible", - "Condor-1.1", "CPAL-1.0", "CPL-1.0", - "CPOL-1.02", - "Crossword", - "CrystalStacker", - "CUA-OPL-1.0", - "Cube", - "curl", - "D-FSL-1.0", - "diffmark", - "DOC", - "Dotseqn", - "DSDP", - "dvipdfm", "ECL-1.0", "ECL-2.0", "EFL-1.0", "EFL-2.0", - "eGenix", "Entessa", "EPL-1.0", "EPL-2.0", - "ErlPL-1.1", "EUDatagrid", - "EUPL-1.0", - "EUPL-1.1", - "Eurosym", + "EUPL-1.2", "Fair", "Frameworx-1.0", - "FreeImage", - "FSFAP", - "FSFUL", - "FSFULLR", - "FTL", - "GFDL-1.1", - "GFDL-1.2", - "GFDL-1.3", - "Giftware", - "GL2PS", - "Glide", - "Glulxe", - "gnuplot", - "GPL-1.0", - "GPL-2.0", - "GPL-3.0", - "gSOAP-1.3b", - "HaskellReport", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", "HPND", - "IBM-pibs", - "ICU", - "IJG", - "ImageMagick", - "iMatix", - "Imlib2", - "Info-ZIP", - "Intel", - "Intel-ACPI", - "Interbase-1.0", "IPA", "IPL-1.0", "ISC", - "JasPer-2.0", - "JSON", - "LAL-1.2", - "LAL-1.3", - "Latex2e", - "Leptonica", - "LGPL-2.0", - "LGPL-2.1", - "LGPL-3.0", - "LGPLLR", - "Libpng", - "libtiff", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LGPL-3.0-or-later", "LiLiQ-P-1.1", "LiLiQ-R-1.1", "LiLiQ-Rplus-1.1", "LPL-1.0", "LPL-1.02", - "LPPL-1.0", - "LPPL-1.1", - "LPPL-1.2", - "LPPL-1.3a", "LPPL-1.3c", - "MakeIndex", "MirOS", "MIT", - "MIT-advertising", - "MIT-CMU", - "MIT-enna", - "MIT-feh", - "MITNFA", + "MIT-0", "Motosoto", - "mpich2", "MPL-1.0", "MPL-1.1", "MPL-2.0", "MPL-2.0-no-copyleft-exception", "MS-PL", "MS-RL", - "MTLL", + "MulanPSL-2.0", "Multics", - "Mup", "NASA-1.3", "Naumen", - "NBPL-1.0", "NCSA", - "NetCDF", - "Newsletr", "NGPL", "NLOD-1.0", - "NLPL", "Nokia", - "NOSL", - "Noweb", - "NPL-1.0", - "NPL-1.1", "NPOSL-3.0", - "NRL", "NTP", - "Nunit", - "OCCT-PL", "OCLC-2.0", "ODbL-1.0", - "OFL-1.0", + "ODC-By-1.0 ", "OFL-1.1", + "OFL-1.1-no-RFN", + "OFL-1.1-RFN", "OGTSL", - "OLDAP-1.1", - "OLDAP-1.2", - "OLDAP-1.3", - "OLDAP-1.4", - "OLDAP-2.0", - "OLDAP-2.0.1", - "OLDAP-2.1", - "OLDAP-2.2", - "OLDAP-2.2.1", - "OLDAP-2.2.2", - "OLDAP-2.3", - "OLDAP-2.4", - "OLDAP-2.5", - "OLDAP-2.6", - "OLDAP-2.7", "OLDAP-2.8", - "OML", - "OpenSSL", - "OPL-1.0", "OSET-PL-2.1", "OSL-1.0", - "OSL-1.1", - "OSL-2.0", "OSL-2.1", "OSL-3.0", "PDDL-1.0", "PHP-3.0", "PHP-3.01", - "Plexus", "PostgreSQL", - "psfrag", - "psutils", "Python-2.0", - "Qhull", "QPL-1.0", - "Rdisc", - "RHeCos-1.1", "RPL-1.1", "RPL-1.5", "RPSL-1.0", - "RSA-MD", "RSCPL", - "Ruby", - "SAX-PD", - "Saxpath", - "SCEA", - "Sendmail", - "SGI-B-1.0", - "SGI-B-1.1", - "SGI-B-2.0", "SimPL-2.0", - "SISSL", - "SISSL-1.2", "Sleepycat", - "SMLNJ", - "SMPPL", - "SNIA", - "Spencer-86", - "Spencer-94", - "Spencer-99", "SPL-1.0", - "SugarCRM-1.1.3", - "SWL", - "TAPR-OHL-1.0", - "TCL", - "TMate", - "TORQUE-1.1", - "TOSL", - "Unicode-TOU", + "UCL-1.0", + "Unicode-DFS-2015", + "Unicode-DFS-2016", "Unlicense", "UPL-1.0", - "Vim", - "VOSTROM", "VSL-1.0", "W3C", - "W3C-19980720", "Watcom-1.0", - "Wsuipa", - "WTFPL", - "X11", - "Xerox", - "XFree86-1.1", - "xinetd", "Xnet", - "xpp", - "XSkat", - "YPL-1.0", - "YPL-1.1", - "Zed", - "Zend-2.0", - "Zimbra-1.3", - "Zimbra-1.4", + "wxWindows", "Zlib", - "zlib-acknowledgement", - "ZPL-1.1", "ZPL-2.0", - "ZPL-2.1" ] }, "licenseURL": { @@ -595,4 +405,4 @@ } } } -} \ No newline at end of file +} From 4ffadc923518c86057e82010c33a15f2d5cb3cbf Mon Sep 17 00:00:00 2001 From: Victor Grau Serrat Date: Thu, 3 Sep 2020 14:06:45 -0600 Subject: [PATCH 4/5] BLD: adjustments to comply with revised criteria --- docs/licenses.md | 21 +++++++------------ excluded/README.md | 20 ++++++++++++++++++ {nominees => excluded}/acceda.json | 0 {nominees => excluded}/archive.json | 0 ...ain-and-vaccination-management-system.json | 0 .../development-data-library.json | 0 {nominees => excluded}/energyplus.json | 0 {excluded-nd => excluded}/merlot.json | 0 {nominees => excluded}/pulseox.json | 0 .../siyavula-open-textbooks.json | 0 ...ndard-energy-efficiency-data-platform.json | 0 {nominees => excluded}/stethoscope.json | 0 {excluded-nd => excluded}/ted.json | 0 nominee-schema.json | 17 ++++++--------- nominees/@firma.json | 4 ---- package.json | 2 +- 16 files changed, 34 insertions(+), 30 deletions(-) create mode 100644 excluded/README.md rename {nominees => excluded}/acceda.json (100%) rename {nominees => excluded}/archive.json (100%) rename {excluded-nd => excluded}/cold-chain-and-vaccination-management-system.json (100%) rename {excluded-nd => excluded}/development-data-library.json (100%) rename {nominees => excluded}/energyplus.json (100%) rename {excluded-nd => excluded}/merlot.json (100%) rename {nominees => excluded}/pulseox.json (100%) rename {excluded-nd => excluded}/siyavula-open-textbooks.json (100%) rename {nominees => excluded}/standard-energy-efficiency-data-platform.json (100%) rename {nominees => excluded}/stethoscope.json (100%) rename {excluded-nd => excluded}/ted.json (100%) diff --git a/docs/licenses.md b/docs/licenses.md index ceb8fb576..5782609d3 100644 --- a/docs/licenses.md +++ b/docs/licenses.md @@ -54,8 +54,7 @@ Full Name | SPDX Identifier 0BSD|0-clause BSD License AAL|Attribution Assurance License AFL-3.0|Academic Free License 3.0 -AGPL-3.0-only|GNU Affero General Public License version 3 only -AGPL-3.0-or-later|GNU Affero General Public License version 3 or later +AGPL-3.0|GNU Affero General Public License version 3 Apache-1.1|Apache Software License 1.1 Apache-2.0|Apache License 2.0 APL-1.0|Adaptive Public License @@ -87,18 +86,14 @@ EUDatagrid|EU DataGrid Software License EUPL-1.2|European Union Public License 1.2 Fair|Fair License Frameworx-1.0|Frameworx License -GPL-2.0-only|GNU General Public License version 2 only -GPL-2.0-or-later|GNU General Public License version 2 or later -GPL-3.0-only|GNU General Public License version 3 only -GPL-3.0-or-later|GNU General Public License version 3 or later +GPL-2.0|GNU General Public License version 2 +GPL-3.0|GNU General Public License version 3 HPND|Historical Permission Notice and Disclaimer IPA|IPA Font License IPL-1.0|IBM Public License 1.0 ISC|ISC License -LGPL-2.1-only|GNU Lesser General Public License version 2.1 only -LGPL-2.1-or-later|GNU Lesser General Public License version 2.1 or later -LGPL-3.0-only|GNU Lesser General Public License version 3 only -LGPL-3.0-or-later|GNU Lesser General Public License version 3 or later +LGPL-2.1|GNU Lesser General Public License version 2.1 +LGPL-3.0|GNU Lesser General Public License version 3 LiLiQ-P-1.1|Licence Libre du Québec – Permissive LiLiQ-R-1.1|Licence Libre du Québec – Réciprocité LiLiQ-Rplus-1.1|Licence Libre du Québec – Réciprocité forte @@ -221,10 +216,8 @@ EUDatagrid EUPL-1.2 Fair Frameworx-1.0 -GPL-2.0-only -GPL-2.0-or-later -GPL-3.0-only -GPL-3.0-or-later +GPL-2.0 +GPL-3.0 HPND IPA IPL-1.0 diff --git a/excluded/README.md b/excluded/README.md new file mode 100644 index 000000000..3020cb080 --- /dev/null +++ b/excluded/README.md @@ -0,0 +1,20 @@ +# Excluded nominees + +This folder contains former nominees that have been excluded as we have updated our minimum criteria. Currently these projects would not be eligible to be nominated, but we keep a copy of their past nominations for archival reasons. Should the reason for their exclusion change in the future (like being released under a compliant license), we will easily nominate them again. + +This file lists the excluded projects, the date of exclusion and the reason for exclusion at that date; sorted in reverse chronological order first, and alphabetically second. + +**⚠️ We do not accept new projects that do not meet the minimum criteria. ⚠️** + +Nominee | Exclusion Date | Reason +Acceda | September 3rd, 2020 | EUPL-1.1 is not an OSI-approved license +Archive | September 3rd, 2020 | EUPL-1.1 is not an OSI-approved license +EnergyPlus | September 3rd, 2020 | BSD-4-Clause is not an OSI-approved license +PulseOx | September 3rd, 2020 | Not accepting nominations for open hardware (license TAPR-OHL-1.0) +Stethoscope| September 3rd, 2020 | Not accepting nominations for open hardware (license TAPR-OHL-1.0) +Standard Energy Efficiency Data Platform | September 3rd, 2020 | BSD-4-Clause is not an OSI-approved license +Cold chain and vaccination management system | April 4th, 2020 | No longer accepting Creative Commons licenses that do not allow No-Derivate works +Development Data Library | April 4th, 2020 | No longer accepting Creative Commons licenses that do not allow No-Derivate works +Merlot | April 4th, 2020 | No longer accepting Creative Commons licenses that do not allow No-Derivate works +Siyavula Open Textbooks | April 4th, 2020 | No longer accepting Creative Commons licenses that do not allow No-Derivate works +TED | April 4th, 2020 | No longer accepting Creative Commons licenses that do not allow No-Derivate works diff --git a/nominees/acceda.json b/excluded/acceda.json similarity index 100% rename from nominees/acceda.json rename to excluded/acceda.json diff --git a/nominees/archive.json b/excluded/archive.json similarity index 100% rename from nominees/archive.json rename to excluded/archive.json diff --git a/excluded-nd/cold-chain-and-vaccination-management-system.json b/excluded/cold-chain-and-vaccination-management-system.json similarity index 100% rename from excluded-nd/cold-chain-and-vaccination-management-system.json rename to excluded/cold-chain-and-vaccination-management-system.json diff --git a/excluded-nd/development-data-library.json b/excluded/development-data-library.json similarity index 100% rename from excluded-nd/development-data-library.json rename to excluded/development-data-library.json diff --git a/nominees/energyplus.json b/excluded/energyplus.json similarity index 100% rename from nominees/energyplus.json rename to excluded/energyplus.json diff --git a/excluded-nd/merlot.json b/excluded/merlot.json similarity index 100% rename from excluded-nd/merlot.json rename to excluded/merlot.json diff --git a/nominees/pulseox.json b/excluded/pulseox.json similarity index 100% rename from nominees/pulseox.json rename to excluded/pulseox.json diff --git a/excluded-nd/siyavula-open-textbooks.json b/excluded/siyavula-open-textbooks.json similarity index 100% rename from excluded-nd/siyavula-open-textbooks.json rename to excluded/siyavula-open-textbooks.json diff --git a/nominees/standard-energy-efficiency-data-platform.json b/excluded/standard-energy-efficiency-data-platform.json similarity index 100% rename from nominees/standard-energy-efficiency-data-platform.json rename to excluded/standard-energy-efficiency-data-platform.json diff --git a/nominees/stethoscope.json b/excluded/stethoscope.json similarity index 100% rename from nominees/stethoscope.json rename to excluded/stethoscope.json diff --git a/excluded-nd/ted.json b/excluded/ted.json similarity index 100% rename from excluded-nd/ted.json rename to excluded/ted.json diff --git a/nominee-schema.json b/nominee-schema.json index d8f70fb40..b91e3fc11 100644 --- a/nominee-schema.json +++ b/nominee-schema.json @@ -52,8 +52,7 @@ "0BSD", "AAL", "AFL-3.0", - "AGPL-3.0-only", - "AGPL-3.0-or-later", + "AGPL-3.0", "Apache-1.1", "Apache-2.0", "APL-1.0", @@ -108,18 +107,14 @@ "EUPL-1.2", "Fair", "Frameworx-1.0", - "GPL-2.0-only", - "GPL-2.0-or-later", - "GPL-3.0-only", - "GPL-3.0-or-later", + "GPL-2.0", + "GPL-3.0", "HPND", "IPA", "IPL-1.0", "ISC", - "LGPL-2.1-only", - "LGPL-2.1-or-later", - "LGPL-3.0-only", - "LGPL-3.0-or-later", + "LGPL-2.1", + "LGPL-3.0", "LiLiQ-P-1.1", "LiLiQ-R-1.1", "LiLiQ-Rplus-1.1", @@ -182,7 +177,7 @@ "Xnet", "wxWindows", "Zlib", - "ZPL-2.0", + "ZPL-2.0" ] }, "licenseURL": { diff --git a/nominees/@firma.json b/nominees/@firma.json index 3eb296455..a082853d6 100644 --- a/nominees/@firma.json +++ b/nominees/@firma.json @@ -6,10 +6,6 @@ { "spdx": "GPL-2.0", "licenseURL": "https://github.com/ctt-gob-es/clienteafirma/blob/master/license/LICENSE.txt" - }, - { - "spdx": "EUPL-1.1", - "licenseURL": "https://github.com/ctt-gob-es/clienteafirma/blob/master/license/LICENSE.txt" } ], "SDGs": [ diff --git a/package.json b/package.json index c920f661d..ec1f028ed 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "JSON schema validation for Digital Public Goods nominees", "main": "index.js", "scripts": { - "test": "ajv validate -s nominee-schema.json -d \"nominees/*.json\" -d \"excluded-nd/*.json\"", + "test": "ajv validate -s nominee-schema.json -d \"nominees/*.json\"", "check": "./scripts/check-filenames.bash", "check:fix": "./scripts/check-filenames.bash --fix", "lint": "for f in ./nominees/*.json; do jsonlint \"$f\" > tempfile.tmp; if diff $f tempfile.tmp; then echo \"Linting of $f passed\"; else echo \"Linting of $f failed\" && exit 1; fi; done", From a7b7a62e5adaba0fa6076c1b9af78e467e83a7d1 Mon Sep 17 00:00:00 2001 From: Victor Grau Serrat Date: Thu, 3 Sep 2020 14:53:55 -0600 Subject: [PATCH 5/5] MAINT: updated CHANGELOG for #56 --- CHANGELOG.md | 2 ++ docs/licenses.md | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fad8add3..b8182f740 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `meilisearch.json` (#50) - Added `code.etalab.gouv.fr.json` (#52) - Added `oer-plan-ceibal-uruguay.json` (#53) +- Added `typescript.json` and `webpack.json` (#55) +- Updated the license requirements for content, data and software nominees resulting in the exclusion of 5 prior nominees. Documented explicitly which licenses are approved and why, and updated the `nominee-schema.json` accordingly (#56) ## [0.4.0] - 2020-04-15 ### Changed diff --git a/docs/licenses.md b/docs/licenses.md index 5782609d3..09717a4bc 100644 --- a/docs/licenses.md +++ b/docs/licenses.md @@ -160,8 +160,7 @@ ZPL-2.0|Zope Public License 2.0 0BSD AAL AFL-3.0 -AGPL-3.0-only -AGPL-3.0-or-later +AGPL-3.0 Apache-1.1 Apache-2.0 APL-1.0 @@ -222,10 +221,8 @@ HPND IPA IPL-1.0 ISC -LGPL-2.1-only -LGPL-2.1-or-later -LGPL-3.0-only -LGPL-3.0-or-later +LGPL-2.1 +LGPL-3.0 LiLiQ-P-1.1 LiLiQ-R-1.1 LiLiQ-Rplus-1.1