From 50d28f9f1825640b718376b3adf63156c07b3996 Mon Sep 17 00:00:00 2001 From: Rowan Cockett Date: Tue, 31 Dec 2024 09:08:16 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=A9=F0=9F=8F=BC=E2=80=8D=F0=9F=92=BC?= =?UTF-8?q?=20Update=20OSI=20Licenses?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/tricky-adults-compare.md | 5 +++ .../myst-frontmatter/src/licenses/licenses.ts | 44 +++++++++++++++++++ .../src/licenses/validators.ts | 5 ++- 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 .changeset/tricky-adults-compare.md diff --git a/.changeset/tricky-adults-compare.md b/.changeset/tricky-adults-compare.md new file mode 100644 index 000000000..5426ccb29 --- /dev/null +++ b/.changeset/tricky-adults-compare.md @@ -0,0 +1,5 @@ +--- +"myst-frontmatter": patch +--- + +OSI updates diff --git a/packages/myst-frontmatter/src/licenses/licenses.ts b/packages/myst-frontmatter/src/licenses/licenses.ts index cc9a514aa..2d35e1ac2 100644 --- a/packages/myst-frontmatter/src/licenses/licenses.ts +++ b/packages/myst-frontmatter/src/licenses/licenses.ts @@ -108,6 +108,9 @@ const licenses: Record> = { 'any-OSI': { name: 'Any OSI License', }, + 'any-OSI-perl-modules': { + name: 'Any OSI License - Perl Modules', + }, 'Apache-1.0': { name: 'Apache License 1.0', free: true, @@ -213,6 +216,9 @@ const licenses: Record> = { 'Boehm-GC': { name: 'Boehm-Demers-Weiser GC License', }, + 'Boehm-GC-without-fee': { + name: 'Boehm-Demers-Weiser GC License (without fee)', + }, Borceux: { name: 'Borceux license', }, @@ -575,6 +581,14 @@ const licenses: Record> = { name: 'Creative Commons Public Domain Dedication and Certification', CC: true, }, + 'CC-PDM-1.0': { + name: 'Creative Commons Public Domain Mark 1.0 Universal', + CC: true, + }, + 'CC-SA-1.0': { + name: 'Creative Commons Share Alike 1.0 Generic', + CC: true, + }, 'CC0-1.0': { name: 'Creative Commons Zero v1.0 Universal', free: true, @@ -747,6 +761,9 @@ const licenses: Record> = { 'DocBook-Schema': { name: 'DocBook Schema License', }, + 'DocBook-Stylesheet': { + name: 'DocBook Stylesheet License', + }, 'DocBook-XML': { name: 'DocBook XML License', }, @@ -891,6 +908,9 @@ const licenses: Record> = { GD: { name: 'GD License', }, + 'generic-xts': { + name: 'Generic XTS License', + }, 'GFDL-1.1-invariants-only': { name: 'GNU Free Documentation License v1.1 only - invariants', }, @@ -1137,6 +1157,9 @@ const licenses: Record> = { 'Inner-Net-2.0': { name: 'Inner Net License v2.0', }, + InnoSetup: { + name: 'Inno Setup License', + }, Intel: { name: 'Intel Open Source License', osi: true, @@ -1351,6 +1374,9 @@ const licenses: Record> = { Minpack: { name: 'Minpack License', }, + MIPS: { + name: 'MIPS License', + }, MirOS: { name: 'The MirOS Licence', osi: true, @@ -1367,6 +1393,9 @@ const licenses: Record> = { 'MIT-advertising': { name: 'Enlightenment License (e16)', }, + 'MIT-Click': { + name: 'MIT Click License', + }, 'MIT-CMU': { name: 'CMU License', }, @@ -1868,6 +1897,9 @@ const licenses: Record> = { 'Sendmail-8.23': { name: 'Sendmail License 8.23', }, + 'Sendmail-Open-Source-1.1': { + name: 'Sendmail Open Source License v1.1', + }, 'SGI-B-1.0': { name: 'SGI Free Software License B v1.0', }, @@ -1910,6 +1942,9 @@ const licenses: Record> = { osi: true, free: true, }, + 'SMAIL-GPL': { + name: 'SMAIL General Public License', + }, SMLNJ: { name: 'Standard ML of New Jersey License', free: true, @@ -1994,6 +2029,9 @@ const licenses: Record> = { 'TGPPL-1.0': { name: 'Transitive Grace Period Public Licence 1.0', }, + ThirdEye: { + name: 'ThirdEye License', + }, threeparttable: { name: 'threeparttable License', }, @@ -2012,6 +2050,9 @@ const licenses: Record> = { 'TPL-1.0': { name: 'THOR Public License 1.0', }, + TrustedQSL: { + name: 'TrustedQSL License', + }, TTWL: { name: 'Text-Tabs+Wrap License', }, @@ -2110,6 +2151,9 @@ const licenses: Record> = { name: 'Do What The F*ck You Want To Public License', free: true, }, + wwl: { + name: 'WWL License', + }, X11: { name: 'X11 License', free: true, diff --git a/packages/myst-frontmatter/src/licenses/validators.ts b/packages/myst-frontmatter/src/licenses/validators.ts index 38bba3723..25403f5d4 100644 --- a/packages/myst-frontmatter/src/licenses/validators.ts +++ b/packages/myst-frontmatter/src/licenses/validators.ts @@ -22,7 +22,7 @@ function correctLicense(license?: string): string | undefined { function createURL(id: string, cc?: boolean, osi?: boolean): string { if (cc) { - const match = /^([CBYSAND0ZEROPD-]+)(?:(?:-)([0-9].[0-9]))?(?:(?:-)([A-Z]{2,3}))?$/.exec(id); + const match = /^([CBYSAND0ZEROPDM-]+)(?:(?:-)([0-9].[0-9]))?(?:(?:-)([A-Z]{2,3}))?$/.exec(id); if (!match) { throw new Error('Creative Commons license not found'); } @@ -57,6 +57,9 @@ function createURL(id: string, cc?: boolean, osi?: boolean): string { case 'CC-PDDC': link = '/publicdomain/'; break; + case 'CC-PDM': + link = '/publicdomain/mark/1.0/'; + break; default: break; }