From 325806b42aa3d5b78e84120327ec877bc936dbdd Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 4 Aug 2018 14:07:24 -0700 Subject: [PATCH 1/9] rm source metadata, defer to SPDX record --- README.md | 1 - _data/meta.yml | 4 ---- _includes/sidebar.html | 2 +- _licenses/afl-3.0.txt | 1 - _licenses/agpl-3.0.txt | 1 - _licenses/apache-2.0.txt | 1 - _licenses/artistic-2.0.txt | 1 - _licenses/bsd-2-clause.txt | 1 - _licenses/bsd-3-clause-clear.txt | 1 - _licenses/bsd-3-clause.txt | 1 - _licenses/bsl-1.0.txt | 1 - _licenses/cc-by-4.0.txt | 1 - _licenses/cc-by-sa-4.0.txt | 1 - _licenses/cc0-1.0.txt | 1 - _licenses/ecl-2.0.txt | 1 - _licenses/epl-1.0.txt | 1 - _licenses/epl-2.0.txt | 1 - _licenses/eupl-1.1.txt | 1 - _licenses/eupl-1.2.txt | 1 - _licenses/gpl-2.0.txt | 1 - _licenses/gpl-3.0.txt | 1 - _licenses/isc.txt | 1 - _licenses/lgpl-2.1.txt | 1 - _licenses/lgpl-3.0.txt | 1 - _licenses/lppl-1.3c.txt | 1 - _licenses/mit.txt | 1 - _licenses/mpl-2.0.txt | 1 - _licenses/ms-pl.txt | 1 - _licenses/ms-rl.txt | 1 - _licenses/ncsa.txt | 1 - _licenses/ofl-1.1.txt | 1 - _licenses/osl-3.0.txt | 1 - _licenses/postgresql.txt | 1 - _licenses/unlicense.txt | 1 - _licenses/upl-1.0.txt | 1 - _licenses/wtfpl.txt | 1 - _licenses/zlib.txt | 1 - 37 files changed, 1 insertion(+), 40 deletions(-) diff --git a/README.md b/README.md index 32fddad..524377c 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,6 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc * `title` - The license full name specified by https://spdx.org/licenses/ * `spdx-id` - Short identifier specified by https://spdx.org/licenses/ -* `source` - The URL to the license source text * `description` - A human-readable description of the license * `how` - Instructions on how to implement the license * `using` - A list of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url` diff --git a/_data/meta.yml b/_data/meta.yml index a85a46a..2a58872 100644 --- a/_data/meta.yml +++ b/_data/meta.yml @@ -9,10 +9,6 @@ description: Short identifier specified by https://spdx.org/licenses/ required: true -- name: source - description: The URL to the license source text - required: true - - name: description description: A human-readable description of the license required: true diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 42821e8..92c4f25 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -19,7 +19,7 @@ {% if page.source %}
- + Source diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index 37f08f9..07ec7a1 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -1,7 +1,6 @@ --- title: Academic Free License v3.0 spdx-id: AFL-3.0 -source: https://opensource.org/licenses/afl-3.0 description: The Academic Free License is a variant of the Open Software License that does not require that the source code of derivative works be disclosed. It contains explicit copyright and patent grants and reserves trademark rights in the author. diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index 56158e2..433632c 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -3,7 +3,6 @@ title: GNU Affero General Public License v3.0 spdx-id: AGPL-3.0 nickname: GNU AGPLv3 redirect_from: /licenses/agpl/ -source: https://www.gnu.org/licenses/agpl-3.0.txt hidden: false description: Permissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. When a modified version is used to provide a service over a network, the complete source code of the modified version must be made available. diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index dbb2d06..5f49c78 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -2,7 +2,6 @@ title: Apache License 2.0 spdx-id: Apache-2.0 redirect_from: /licenses/apache/ -source: https://www.apache.org/licenses/LICENSE-2.0.html featured: true hidden: false diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt index af0f87d..043e5e8 100644 --- a/_licenses/artistic-2.0.txt +++ b/_licenses/artistic-2.0.txt @@ -2,7 +2,6 @@ title: Artistic License 2.0 spdx-id: Artistic-2.0 redirect_from: /licenses/artistic/ -source: https://spdx.org/licenses/Artistic-2.0.html description: Heavily favored by the Perl community, the Artistic license requires that modified versions of the software do not prevent users from running the standard version. diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index 1bcd590..58faba1 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -2,7 +2,6 @@ title: BSD 2-Clause "Simplified" License spdx-id: BSD-2-Clause redirect_from: /licenses/bsd/ -source: https://opensource.org/licenses/BSD-2-Clause hidden: false description: A permissive license that comes in two variants, the BSD 2-Clause and BSD 3-Clause. Both have very minute differences to the MIT license. diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt index 30b8289..e8a464b 100644 --- a/_licenses/bsd-3-clause-clear.txt +++ b/_licenses/bsd-3-clause-clear.txt @@ -1,7 +1,6 @@ --- title: BSD 3-Clause Clear License spdx-id: BSD-3-Clause-Clear -source: https://spdx.org/licenses/BSD-3-Clause-Clear.html description: A variant of the BSD 3-Clause License that explicitly does not grant any patent rights. diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index fc804a7..d8a5a48 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -1,7 +1,6 @@ --- title: BSD 3-Clause "New" or "Revised" License spdx-id: BSD-3-Clause -source: https://opensource.org/licenses/BSD-3-Clause hidden: false description: A permissive license similar to the BSD 2-Clause License, but with a 3rd clause that prohibits others from using the name of the project or its contributors to promote derived products without written consent. diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt index e2f16bf..e595a5c 100644 --- a/_licenses/bsl-1.0.txt +++ b/_licenses/bsl-1.0.txt @@ -1,7 +1,6 @@ --- title: Boost Software License 1.0 spdx-id: BSL-1.0 -source: https://opensource.org/licenses/BSL-1.0 description: A simple permissive license only requiring preservation of copyright and license notices for source (and not binary) distribution. Licensed works, modifications, and larger works may be distributed under different terms and without source code. diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index 41b3a2b..52233ed 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -1,7 +1,6 @@ --- title: Creative Commons Attribution 4.0 International spdx-id: CC-BY-4.0 -source: https://creativecommons.org/licenses/by/4.0/legalcode.txt description: Permits almost any use subject to providing credit and license notice. Frequently used for media assets and educational materials. The most common license for Open Access scientific publications. Not recommended for software. diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index c098290..21afff8 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -1,7 +1,6 @@ --- title: Creative Commons Attribution Share Alike 4.0 International spdx-id: CC-BY-SA-4.0 -source: https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt description: Similar to CC-BY-4.0 but requires derivatives be distributed under the same or a similar, compatible license. Frequently used for media assets and educational materials. A previous version is the default license for Wikipedia and other Wikimedia projects. Not recommended for software. diff --git a/_licenses/cc0-1.0.txt b/_licenses/cc0-1.0.txt index bcdecc7..81b345d 100644 --- a/_licenses/cc0-1.0.txt +++ b/_licenses/cc0-1.0.txt @@ -2,7 +2,6 @@ title: Creative Commons Zero v1.0 Universal spdx-id: CC0-1.0 redirect_from: /licenses/cc0/ -source: https://creativecommons.org/publicdomain/zero/1.0/ description: The Creative Commons CC0 Public Domain Dedication waives copyright interest in a work you've created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach. As with the Unlicense and typical software licenses, CC0 disclaims warranties. CC0 is very similar to the Unlicense. diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index 447eb23..fc2ad2c 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -1,7 +1,6 @@ --- title: Educational Community License v2.0 spdx-id: ECL-2.0 -source: https://opensource.org/licenses/ECL-2.0 description: The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license. diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 125bd88..2495b09 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -1,7 +1,6 @@ --- title: Eclipse Public License 1.0 spdx-id: EPL-1.0 -source: https://www.eclipse.org/legal/epl-v10.html description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones. diff --git a/_licenses/epl-2.0.txt b/_licenses/epl-2.0.txt index 10c59a6..c6aab5f 100644 --- a/_licenses/epl-2.0.txt +++ b/_licenses/epl-2.0.txt @@ -2,7 +2,6 @@ title: Eclipse Public License 2.0 spdx-id: EPL-2.0 redirect_from: /licenses/eclipse/ -source: https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt hidden: false description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones. diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index 6f679ab..b2512b7 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -2,7 +2,6 @@ title: European Union Public License 1.1 spdx-id: EUPL-1.1 redirect_from: /licenses/eupl-v1.1/ -source: https://joinup.ec.europa.eu/page/eupl-text-11-12 description: The “European Union Public Licence” (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index 1cb6c34..7413aef 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -1,7 +1,6 @@ --- title: European Union Public License 1.2 spdx-id: EUPL-1.2 -source: https://eur-lex.europa.eu/legal-content/TXT/?uri=CELEX%3A32017D0863 description: The European Union Public Licence (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 6f0d042..36797f2 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -3,7 +3,6 @@ title: GNU General Public License v2.0 spdx-id: GPL-2.0 nickname: GNU GPLv2 redirect_from: /licenses/gpl-v2/ -source: https://www.gnu.org/licenses/gpl-2.0.txt hidden: false description: The GNU GPL is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license. There are multiple variants of the GNU GPL, each with different requirements. diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index f7434e7..bed6e53 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -3,7 +3,6 @@ title: GNU General Public License v3.0 spdx-id: GPL-3.0 nickname: GNU GPLv3 redirect_from: /licenses/gpl-v3/ -source: https://www.gnu.org/licenses/gpl-3.0.txt featured: true hidden: false diff --git a/_licenses/isc.txt b/_licenses/isc.txt index 8e34275..47de91a 100644 --- a/_licenses/isc.txt +++ b/_licenses/isc.txt @@ -1,7 +1,6 @@ --- title: ISC License spdx-id: ISC -source: https://opensource.org/licenses/isc-license description: A permissive license lets people do anything with your code with proper attribution and without warranty. The ISC license is functionally equivalent to the BSD 2-Clause and MIT licenses, removing some language that is no longer necessary. diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index 88fb2d3..6ffdad8 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -3,7 +3,6 @@ title: GNU Lesser General Public License v2.1 spdx-id: LGPL-2.1 nickname: GNU LGPLv2.1 redirect_from: /licenses/lgpl-v2.1/ -source: https://www.gnu.org/licenses/lgpl-2.1.txt hidden: false description: Primarily used for software libraries, the GNU LGPL requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction. There are two commonly used versions of the GNU LGPL. diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index f3b785f..13dc9c9 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -3,7 +3,6 @@ title: GNU Lesser General Public License v3.0 spdx-id: LGPL-3.0 nickname: GNU LGPLv3 redirect_from: /licenses/lgpl-v3/ -source: https://www.gnu.org/licenses/lgpl-3.0.txt hidden: false description: Permissions of this copyleft license are conditioned on making available complete source code of licensed works and modifications under the same license or the GNU GPLv3. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. However, a larger work using the licensed work through interfaces provided by the licensed work may be distributed under different terms and without source code for the larger work. diff --git a/_licenses/lppl-1.3c.txt b/_licenses/lppl-1.3c.txt index 984bf3b..97d51e7 100644 --- a/_licenses/lppl-1.3c.txt +++ b/_licenses/lppl-1.3c.txt @@ -1,7 +1,6 @@ --- title: LaTeX Project Public License v1.3c spdx-id: LPPL-1.3c -source: https://latex-project.org/lppl/lppl-1-3c.html description: The LaTeX Project Public License (LPPL) is the primary license under which the LaTeX kernel and the base LaTeX packages are distributed. diff --git a/_licenses/mit.txt b/_licenses/mit.txt index 5104ab2..2fd72e4 100644 --- a/_licenses/mit.txt +++ b/_licenses/mit.txt @@ -1,7 +1,6 @@ --- title: MIT License spdx-id: MIT -source: https://opensource.org/licenses/MIT featured: true hidden: false diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index 934af1f..dd31d6a 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -2,7 +2,6 @@ title: Mozilla Public License 2.0 spdx-id: MPL-2.0 redirect_from: /licenses/mozilla/ -source: https://www.mozilla.org/media/MPL/2.0/index.txt hidden: false description: Permissions of this weak copyleft license are conditioned on making available source code of licensed files and modifications of those files under the same license (or in certain cases, one of the GNU licenses). Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. However, a larger work using the licensed work may be distributed under different terms and without source code for files added in the larger work. diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt index 472fd95..951572e 100644 --- a/_licenses/ms-pl.txt +++ b/_licenses/ms-pl.txt @@ -1,7 +1,6 @@ --- title: Microsoft Public License spdx-id: MS-PL -source: https://opensource.org/licenses/ms-pl description: An open source license with a patent grant. diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index e015f13..d139ee8 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -1,7 +1,6 @@ --- title: Microsoft Reciprocal License spdx-id: MS-RL -source: https://opensource.org/licenses/ms-rl description: An open source license with a patent grant similar to the Microsoft Public License, with the additional condition that any source code for any derived file be provided under this license. diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index 0897884..9f1dab9 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -2,7 +2,6 @@ title: University of Illinois/NCSA Open Source License spdx-id: NCSA nickname: UIUC/NCSA -source: https://opensource.org/licenses/NCSA description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. Its conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibition of using the names of the authors or the project organization to promote or endorse derived products. diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.txt index 594696f..066a30f 100644 --- a/_licenses/ofl-1.1.txt +++ b/_licenses/ofl-1.1.txt @@ -2,7 +2,6 @@ title: SIL Open Font License 1.1 spdx-id: OFL-1.1 redirect_from: /licenses/ofl/ -source: http://scripts.sil.org/OFL_web description: The Open Font License (OFL) is maintained by SIL International. It attempts to be a compromise between the values of the free software and typeface design communities. It is used for almost all open source font projects, including those by Adobe, Google and Mozilla. diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index 6e02d23..4533ce3 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -1,7 +1,6 @@ --- title: Open Software License 3.0 spdx-id: OSL-3.0 -source: https://opensource.org/licenses/OSL-3.0 description: OSL 3.0 is a copyleft license that does not require reciprocal licensing on linked works. It also provides an express grant of patent rights from contributors to users, with a termination clause triggered if a user files a patent infringement lawsuit. diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index 8b9cd98..31f9e12 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -1,7 +1,6 @@ --- title: PostgreSQL License spdx-id: PostgreSQL -source: https://opensource.org/licenses/PostgreSQL description: A very short, BSD-style license, used specifically for PostgreSQL. diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index db18a75..e6a8ae9 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -1,7 +1,6 @@ --- title: The Unlicense spdx-id: Unlicense -source: https://unlicense.org/UNLICENSE hidden: false description: A license with no conditions whatsoever which dedicates works to the public domain. Unlicensed works, modifications, and larger works may be distributed under different terms and without source code. diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index eab17b0..0578766 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -1,7 +1,6 @@ --- title: Universal Permissive License v1.0 spdx-id: UPL-1.0 -source: https://oss.oracle.com/licenses/upl/ description: A permissive, OSI and FSF approved, GPL compatible license, expressly allowing attribution with just a copyright notice and a short form link rather than the full text of the license. Includes an express grant of patent rights. Licensed works and modifications may be distributed under different terms and without source code, and the patent grant may also optionally be expanded to larger works to permit use as a contributor license agreement. diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.txt index 2a23d0a..bbe5160 100644 --- a/_licenses/wtfpl.txt +++ b/_licenses/wtfpl.txt @@ -1,7 +1,6 @@ --- title: "Do What The F*ck You Want To Public License" spdx-id: WTFPL -source: http://www.wtfpl.net/txt/copying/ description: The easiest license out there. It gives the user permissions to do whatever they want with your code. diff --git a/_licenses/zlib.txt b/_licenses/zlib.txt index 1022261..0be8fd0 100644 --- a/_licenses/zlib.txt +++ b/_licenses/zlib.txt @@ -1,7 +1,6 @@ --- title: zlib License spdx-id: Zlib -source: https://opensource.org/licenses/Zlib description: A short permissive license, compatible with GPL. Requires altered source versions to be documented as such. From 719b9bd02e71957a3b544625eb06c0cdeb8de5d8 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 18 Aug 2018 16:17:46 -0700 Subject: [PATCH 2/9] BSD-2/3-Clause numbered list, uses SPDX and OSI have numbered lists for these licenses --- _licenses/bsd-2-clause.txt | 13 ++++++++----- _licenses/bsd-3-clause.txt | 19 +++++++++++-------- spec/license_meta_spec.rb | 2 -- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index 1bcd590..a2cc802 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -10,6 +10,9 @@ description: A permissive license that comes in two variants, the Date: Sat, 18 Aug 2018 21:55:26 -0400 Subject: [PATCH 3/9] Change phrasing of no-license text. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 21c5a0f..f3d2477 100644 --- a/index.html +++ b/index.html @@ -72,7 +72,7 @@ permalink: /

  • I don’t want to choose a license.

    - You don’t have to. + Here’s what happens if you don’t.

    • From 4fb84bb7bd7a8cad0d41129750d41c5005cb3dac Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 20 Aug 2018 11:25:14 -0700 Subject: [PATCH 4/9] new ruby version from github-pages --- .rubocop.yml | 2 +- .travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index fca3b19..4b122f8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.4 + TargetRubyVersion: 2.5 Exclude: - _site/**/* - vendor/**/* diff --git a/.travis.yml b/.travis.yml index fe5828b..7ab30fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ script: "./script/cibuild" #environment language: ruby rvm: - - 2.4.2 + - 2.5.1 addons: apt: From e1083628812757c5f4248b3d4717acbd6fc4d431 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 20 Aug 2018 11:52:33 -0700 Subject: [PATCH 5/9] possible workaround --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7ab30fb..ce0b3b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,10 @@ addons: packages: - libcurl4-openssl-dev +before_install: + - gem update --system + - gem install bundler + branches: only: - gh-pages From ed9c22c9489bf97a3e7a9550cb60fff2d4da4ec7 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 20 Aug 2018 11:59:27 -0700 Subject: [PATCH 6/9] different workaround https://github.com/bundler/bundler/issues/6629 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce0b3b8..d38594a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,7 @@ addons: - libcurl4-openssl-dev before_install: - - gem update --system - - gem install bundler + - gem install bundler --version 1.16.2 branches: only: From b5972d3bebfe5389b7850be518ba6378f28f85f6 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 20 Aug 2018 12:09:00 -0700 Subject: [PATCH 7/9] bundler version in script/bootstrap which runs after before_install --- .travis.yml | 3 --- script/bootstrap | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d38594a..7ab30fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,6 @@ addons: packages: - libcurl4-openssl-dev -before_install: - - gem install bundler --version 1.16.2 - branches: only: - gh-pages diff --git a/script/bootstrap b/script/bootstrap index b659455..b37867e 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -3,7 +3,7 @@ set -e echo "bundling installin'" -gem install bundler +gem install bundler --version 1.16.2 bundle install echo From 63220fb38215d1441061e913d677bd381922a990 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 20 Aug 2018 12:29:29 -0700 Subject: [PATCH 8/9] use example without hardcoded party in text --- _licenses/bsd-3-clause.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index 79d007a..08994de 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -10,7 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of using: - d3: https://github.com/d3/d3/blob/master/LICENSE - LevelDB: https://github.com/google/leveldb/blob/master/LICENSE - - Scala: https://github.com/scala/scala/blob/2.13.x/LICENSE + - Quill: https://github.com/quilljs/quill/blob/develop/LICENSE permissions: - commercial-use From 92ce1397090fad04a676794d87ebf4b89fa203e1 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 26 Aug 2018 16:09:37 -0700 Subject: [PATCH 9/9] update license links in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 524377c..7b6b860 100644 --- a/README.md +++ b/README.md @@ -97,4 +97,4 @@ The license properties (rules) are stored as a bulleted list within the licenses ## License -The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](https://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](https://opensource.org/licenses/mit-license.php). +The content of this project itself is licensed under the [Creative Commons Attribution 3.0 Unported license](https://creativecommons.org/licenses/by/3.0/), and the underlying source code used to format and display that content is licensed under the [MIT license](LICENSE.md).