1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-13 23:18:53 +01:00
Commit Graph

1592 Commits

Author SHA1 Message Date
Avi Miller
da9fae2886 Fixed word wrap to 78 characters or less.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2018-04-10 11:27:26 -05:00
Avi Miller
119bff740a Updating upl-1.0.txt based on Travis failures. Fixing title
attribute first to confirm I understand the failure messages.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
2018-04-10 11:19:49 -05:00
Avi Miller
3ea34240f1 Adding the Universal Permissive License 1.0.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2018-04-10 09:06:28 -05:00
Mike Linksvayer
1c8e3d1439
Merge pull request #579 from wking/update-fsf-api-structure
spec_helper: Adjust to new 'licenses' key in the FSF API
2018-04-07 16:45:04 -07:00
W. Trevor King
24fbf6685d spec_helper: Adjust to new 'licenses' key in the FSF API
The old root object has been moved under 'licenses' with
wking/fsf-api@8398a357 (pull: Add JSON-LD markup, 2018-01-04,
wking/fsf-api#12) for better forward/backward compatibility.
Unfortunately, this results in another one-time incompatible change,
which this commit accommodates.

The protection from future changes (which should be rare) isn't great,
because we're still parsing the document as JSON.  There is at least
one JSON-LD parser for Ruby [1], but I've stuck with vanilla JSON to
avoid pullling in an external dependency just for this rather
peripheral functionality.

[1]: https://github.com/ruby-rdf/json-ld/
2018-04-07 16:22:44 -07:00
Mike Linksvayer
b3eb7aacc7
Merge branch 'gh-pages' into cc0-source-text 2018-04-05 13:31:36 -07:00
Mike Linksvayer
5513a3baab
Merge pull request #577 from github/rm-cla-instruction
Remove obsolete CLA instructions
2018-03-28 09:57:21 -07:00
Mike Linksvayer
c89376ae18
Remove obsolete CLA instructions
Followup to #573, fixes #576
2018-03-28 09:51:49 -07:00
Mike Linksvayer
23ecca3aca
Merge pull request #575 from github/opencop
Rubocop 0.53 doesn't like kernel#open use more specific OpenURI.open_…
2018-03-15 14:26:17 -07:00
Mike Linksvayer
adb35c0c82 Rubocop 0.53 doesn't like kernel#open use more specific OpenURI.open_uri instead
841569b305/manual/cops_security.md (securityopen)

Not sure this is really a problem for tests, but easiest to just change.
2018-03-14 18:45:10 -07:00
Mike McQuaid
91401bb18e
Merge pull request #573 from github/contributing-license
CONTRIBUTING: note license.
2018-02-16 09:30:57 +00:00
Mike McQuaid
a03e61a993
CONTRIBUTING: note license.
This is to be more explicit about the contribution process and license.
2018-02-16 09:09:15 +00:00
Mike Linksvayer
9e0a0e7b49
Merge branch 'gh-pages' into cc0-source-text 2018-01-30 16:28:36 -08:00
Mike Linksvayer
bcdc73826e
Merge branch 'gh-pages' into only-or-later 2018-01-27 15:33:16 -08:00
Mike Linksvayer
c88337772f
Merge pull request #570 from github/rusty-crates
Update rust package license metadata link
2018-01-11 11:21:04 -08:00
Mike Linksvayer
2b16dbd1e2
Update rust package license metadata link
As noted by @wking at https://github.com/github/choosealicense.com/pull/563/files#r160834170
2018-01-10 17:31:01 -08:00
Mike Linksvayer
281aa8a3d5
Merge pull request #523 from MattiSG/patch-1
Add EUPL v1.2
2018-01-04 14:15:40 -08:00
Mike Linksvayer
570ef6d1e0
sort examples 2018-01-04 14:07:37 -08:00
Matti Schneider
7d3a9527ec
Merge branch 'gh-pages' into patch-1 2018-01-05 10:48:39 +13:00
Matti Schneider
52a36d095f
fixup! Reference projects with unmodified license text 2018-01-05 10:43:53 +13:00
Matti Schneider
b0239b1610
Reference projects with unmodified license text
Licensee gem requires the text to not have any prefix
2018-01-05 10:39:25 +13:00
Matti Schneider
4863d6e863
fixup! Line wrap at 78 characters 2018-01-05 09:44:26 +13:00
Matti Schneider
372765db81
List three projects using EUPL 1.2 2018-01-04 17:59:16 +13:00
Mike Linksvayer
73e0782813
Merge pull request #566 from sdbedi/patch-1
Update License year to 2018
2018-01-03 12:08:04 -08:00
Mike Linksvayer
3c6df021c7
Merge branch 'gh-pages' into patch-1 2018-01-03 12:05:51 -08:00
Mike Linksvayer
80132f7359
Merge pull request #565 from github/projecturl
project_url -> projecturl
2018-01-03 12:05:23 -08:00
Mike Linksvayer
f9f84734ce
Merge branch 'gh-pages' into projecturl 2018-01-03 12:01:10 -08:00
Mike Linksvayer
3174c978cf
Merge pull request #567 from wking/check-approval-license-ids
check-approval: Fix missing license_ids variable
2018-01-03 12:00:49 -08:00
W. Trevor King
45369acf79 check-approval: Fix missing license_ids variable
Avoid:

   $ ./script/check-approval MIT
   ./script/check-approval:55:in `<main>': undefined local variable or method `license_ids' for main:Object (NameError)

The license_ids line was added in e505eb8f (check if license is aleady
a license, 2016-01-18, #318), but license_ids was removed from the
helper in b99e7ab0 (replace 'id' variables with 'spdx_lcase' to
minimize confusion, 2016-06-01, #424).  This commit restores the old
code locally, since this script is the only consumer.
2018-01-03 11:58:21 -08:00
Mike Linksvayer
156babeadf
Merge pull request #569 from wking/fsf-api
spec_helper: Extract FSF approval from wking.github.io/fsf-api
2018-01-03 11:57:21 -08:00
W. Trevor King
84a7bbbf96 spec_helper: Extract FSF approval from wking.github.io/fsf-api
Ideally the FSF would be maintaining the API (or any API), but until
someone can talk them into that I think we can save work by
collaborating on the mock API.  Using a JSON API also allows us to
drop the Nokogiri dependency.

The parens feel excessive, and I'm not familiar with Ruby, so they
might be.  However, removing the parens from the libre check resulted
in:

  $ ./script/check-approval ISC
  ./script/check-approval:8:in `require_relative': /.../choosealicense.com/spec/spec_helper.rb:108: syntax error, unexpected tSTRING_BEG, expecting keyword_then or ';' or '\n' (SyntaxError)
  ...gs') && meta['tags'].include? 'libre'
  ...                               ^
  /.../choosealicense.com/spec/spec_helper.rb:116: syntax error, unexpected keyword_end, expecting end-of-input
          from ./script/check-approval:8:in `<main>'
2018-01-03 11:53:36 -08:00
Mike Linksvayer
3ad9bf7f0f
Merge pull request #568 from wking/case-insensitive-spdx-lookup
spec_helper: Restore case-insensitive matching in find_spdx
2018-01-03 11:34:13 -08:00
W. Trevor King
af78adb4fe spec_helper: Restore case-insensitive matching in find_spdx
The previous case-insensitive matching was removed in e5f46faa (test
required spdx-ids against data from spdx, 2016-05-25, #418).  That
commit was designed [1] to allow case-sensitive matching as discussed
in [2].  But while I'm in favor of case-sensitive keys in spdx_list,
the case-sensitive match breaks script/check-approval which downcases
its argument since it was added in 8e56bb83 (add
script/check-approval, 2016-01-18, #318).

There are more notes on SPDX's plans for case sensitivity in [3], so
we should see a clearer policy there soon.  I'm arguing for
case-sensitive *display* with optional case-insensitive matching.  I
am optimistic that the SPDX will at least agree not to register short
IDs that only differ by case, which is all we need to make this
case-insensitive match safe here.

[1]: https://github.com/github/choosealicense.com/pull/418#issuecomment-221404630
[2]: https://github.com/benbalter/licensee/issues/72
[3]: https://github.com/spdx/spdx-spec/issues/63
2018-01-03 11:13:08 -08:00
Sheel Bedi
c51d2e956e
Update License year to 2018 2018-01-03 03:37:33 -06:00
Mike Linksvayer
1e715f44b1 project_url -> projecturl 2018-01-02 18:09:38 -08:00
Mike Linksvayer
5f83952a41
Merge pull request #564 from github/project_url
Document project_url field
2018-01-02 16:06:32 -08:00
Mike Linksvayer
316bd0b828 match _ fields, require preceding space (ex CECILL-2.1) 2018-01-02 14:35:04 -08:00
Mike Linksvayer
d7bf3ac98a Revert "rm no longer relevant test"
This reverts commit 5e7b07f998.
2018-01-02 14:25:04 -08:00
Mike Linksvayer
e630ac7f29 project_url field 2018-01-02 14:24:52 -08:00
Mike Linksvayer
f3988a7faa SPDX license list 3.0 uses -or-later and -only over + and no modifier
Reflect that in sidebar instructions for *GPL as seen e.g. at
https://choosealicense.com/licenses/agpl-3.0/
2017-12-31 10:03:56 -08:00
Mike Linksvayer
47920250b2
Merge pull request #562 from github/self-test
Test this project's license
2017-12-31 09:43:53 -08:00
Mike Linksvayer
a093c99d3c rubocop 2017-12-30 15:48:07 -08:00
Mike Linksvayer
c3f9bea852 change no-license internal links 2017-12-30 15:46:13 -08:00
Mike Linksvayer
28fa8ca521 rename and redirect no-license to no-permission avodiing licensee false negative 2017-12-30 15:42:15 -08:00
Mike Linksvayer
2459e4ff99 add test that this project's license detected as MIT 2017-12-30 15:38:31 -08:00
Mike Linksvayer
8cac9c3d8e
Merge pull request #554 from github/epl-2.0
Add EPL-2.0
2017-12-29 15:22:34 -08:00
Mike Linksvayer
f2aabb8057
2 more examples 2017-12-29 15:18:11 -08:00
Mike Linksvayer
7b6067ed2c
Merge branch 'gh-pages' into epl-2.0 2017-12-29 14:58:54 -08:00
Mike Linksvayer
cd7b21ab7e
Merge branch 'gh-pages' into patch-1 2017-12-29 14:54:59 -08:00
Mike Linksvayer
5ad0a4374a
Merge pull request #560 from github/spdx-3.0
Test against SPDX-provided list
2017-12-29 14:54:34 -08:00