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.

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

LLNS re-release under LGPL-3.0 #1901

Merged
merged 30 commits into from Jan 3, 2019

Conversation

Projects
None yet
5 participants
@garlick
Copy link
Member

garlick commented Jan 3, 2019

As discussed in #1887, Flux has been approved by LLNS for release under LGPL-3.0.

This updates top level files per LLNL Software LIcensing instructions, and replaces the copyright notice in each source file with the shorter SPDX one discussed in the issue:

/************************************************************\
 * Copyright 2015 Lawrence Livermore National Security, LLC
 * (c.f. AUTHORS, NOTICE.LLNS, COPYING)
 *
 * This file is part of the Flux resource manager framework.
 * For details, see https://github.com/flux-framework.
 *
 * SPDX-License-Identifier: LGPL-3.0 
\************************************************************/

I did retain the full text of the license in the file COPYING as is the GNU custom, but symlinked it from LICENSE per the LLNS instructions. Same with NOTICE -> NOTICE.LLNS, since it seemed good to designate it as part of the lab boilerplate like we did in the past with DISCLAIMER.LLNS.

In the past we had left off the copyright notice on non-installed header files and tests. I went ahead and added headers to those files per our discussion.

In python land, I did not find any copyright notices and didn't add any, as a bit of googling around had me wondering what standard practice was, e.g. this stack overflow question. Any thoughts?

@trws, I was already 3/4 of the way through editing headers by hand when I received your script, and as it wasn't self contained (is rg this?) I just went ahead and finished it by hand. Thanks again for pushing through the re-release under this license, and for the first attempt at updating files in flux-core.

garlick added some commits Jan 2, 2019

README: add reference to README.md
Problem: README is empty.

As with NEWS and NEWS.md, add a pointer to the README.md
file from the README file.
libflux: change license to LGPLv3
Also update the flux/core.h include file.
CONTRIBUTING.md: reference RFC 2
Problem: CONTRIBUTING.md references RFC 1 and 7,
but fails to reference RFC 2 which covers licensing.

Add a reference to RFC 2.
DISCLAIMER.LLNS: remove outdated notice
This was superceded by the NOTICE.LLNS so remove it.
libutil: change license to LGPLv3
Chagne all flux-original files (not vendored dependencies).
@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Jan 3, 2019

Codecov Report

Merging #1901 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1901      +/-   ##
==========================================
- Coverage   80.14%   80.13%   -0.01%     
==========================================
  Files         196      196              
  Lines       35064    35065       +1     
==========================================
- Hits        28101    28100       -1     
- Misses       6963     6965       +2
Impacted Files Coverage Δ
src/broker/heartbeat.c 86.11% <ø> (ø) ⬆️
src/cmd/builtin/proxy.c 74.55% <ø> (ø) ⬆️
src/cmd/flux-jobspec-validate.cpp 77.77% <ø> (ø) ⬆️
src/common/libflux/event.c 80.14% <ø> (ø) ⬆️
src/common/libpmi/simple_server.c 52.94% <ø> (ø) ⬆️
src/broker/overlay.c 84.58% <ø> (ø) ⬆️
src/common/libkz/kz.c 81.59% <ø> (ø) ⬆️
src/common/libflux/service.c 60% <ø> (ø) ⬆️
src/cmd/flux-job.c 90.41% <ø> (ø) ⬆️
src/broker/publisher.c 82.47% <ø> (ø) ⬆️
... and 177 more

@garlick garlick force-pushed the garlick:license_change branch from ae27d47 to fcbc30a Jan 3, 2019

testsuite: change license to LGPLv3
In many cases, add headers to source code
that had none.

@garlick garlick force-pushed the garlick:license_change branch from fcbc30a to 8467f4a Jan 3, 2019

@garlick

This comment has been minimized.

Copy link
Member Author

garlick commented Jan 3, 2019

After speaking with @SteVwonder, just added copyright notices to python bindings and testsuite files. First I tried a triple-quoted long string, but the formatter checker complained

W0105: String statement has no effect (pointless-string-statement)

so I went with hash comments, e.g.

###############################################################
# Copyright 2014 Lawrence Livermore National Security, LLC
# (c.f. AUTHORS, NOTICE.LLNS, COPYING)
#
# This file is part of the Flux resource manager framework.
# For details, see https://github.com/flux-framework.
#
# SPDX-License-Identifier: LGPL-3.0
###############################################################
@SteVwonder

This comment has been minimized.

Copy link
Member

SteVwonder commented Jan 3, 2019

LGTM!

I think the pylint errors were from having two consecutive docstrings/long strings (since some of the modules have a docstring that describe the module), but I think I actually like the # comments better.

(is rg this?)

Yep!

EDIT: I looked at the __license__ = "LGPL" example on StackOverflow. Looks like that specific dunder is an epydoc-ism. Also looks like most of the python community just uses __version__. So I'm fine if we don't add the __license__ dunder. I'll open an issue about the __version__ though.

@grondo

This comment has been minimized.

Copy link
Contributor

grondo commented Jan 3, 2019

Excellent! Thanks for all the work!

@grondo grondo merged commit 07a5cf0 into flux-framework:master Jan 3, 2019

2 of 3 checks passed

codecov/project 80.13% (-0.01%) compared to acdd8f1
Details
codecov/patch Coverage not affected when comparing acdd8f1...8467f4a
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@trws

This comment has been minimized.

Copy link
Member

trws commented Jan 3, 2019

Very cool! Thanks for plowing through this @garlick, sorry the stuff I sent wasn't useful. =/

@garlick

This comment has been minimized.

Copy link
Member Author

garlick commented Jan 3, 2019

No it helped a bit - thanks :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.