Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add UPL-1.0 identifier from https://spdx.org/licenses/ #9

Merged
merged 1 commit into from
Jan 5, 2018
Merged

Add UPL-1.0 identifier from https://spdx.org/licenses/ #9

merged 1 commit into from
Jan 5, 2018

Conversation

ltratt
Copy link
Contributor

@ltratt ltratt commented Jul 31, 2017

This PR simply adds the UPL-1.0 identifier from https://spdx.org/licenses/ (needed for things like https://github.com/softdevteam/cactus).

Notice that before and after this PR there is a failing test:

---- tests::compound_license stdout ----
        thread 'tests::compound_license' panicked at 'assertion failed: super::validate_license_expr("GPL-3.0+ WITH Classpath-exception-2.0 OR MIT AND AAL").is_ok()', src/lib.rs:86
note: Run with `RUST_BACKTRACE=1` for a backtrace.

but I don't think this PR is the right place to fix that.

ltratt added a commit to softdevteam/cactus that referenced this pull request Jul 31, 2017
@ltratt
Get things in a fit state for publishing to crates.io.
4c3d5e7 
The UPL isn't yet supported by crates.io (hopefully it eventually will be due to
ehuss/license-exprs#9) so we have to add a
separate LICENSE file. This also adds a couple of other attributes which will
make things easier to find on crates.io.
@ltratt ltratt mentioned this pull request Jul 31, 2017
Merged
wking
wking approved these changes Jan 4, 2018
View reviewed changes
Copy link
Contributor

@wking wking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UPL-1.0 was in the 2.4 license list. I guess this just slipped through #7.

@wking wking merged commit c3ef6ea into ehuss:master Jan 5, 2018
wking added a commit to wking/license-exprs that referenced this pull request Jun 18, 2018
@wking
Cargo.toml: Bump to v1.4.0
d45c632 
Changes since v1.3.0:

* Updated SPDX License List to 3.1 (ehuss#9, ehuss#11, ehuss#17, ehuss#19, ehuss#24)
* Updated SPDX License Expression reference from 2.0 to 2.1 (ehuss#8).
* Document our license-list version, parens issue, and license (ehuss#16,
  ehuss#17).
* Add Travis CI configuration (ehuss#22).
* Add additional test cases (ehuss#25).
* .mailmap: Consolidate authors (ehuss#26).
@wking wking mentioned this pull request Jun 18, 2018
Merged
wking added a commit to wking/license-exprs that referenced this pull request Jun 18, 2018
@wking
Cargo.toml: Bump to v1.4.0
b8ebb7e 
Changes since v1.3.0:

* Updated SPDX License List to 3.1 (ehuss#9, ehuss#11, ehuss#17, ehuss#19, ehuss#24).
* Updated SPDX License Expression reference from 2.0 to 2.1 (ehuss#8).
* Document our license-list version, parens issue, and license (ehuss#16,
  ehuss#17).
* Add Travis CI configuration (ehuss#22).
* Add additional test cases (ehuss#25).
* .mailmap: Consolidate authors (ehuss#26).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wking wking wking approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ltratt @wking