Closed junghans closed 5 years ago
Merging #98 into master will not change coverage. The diff coverage is
n/a
.
@@ Coverage Diff @@
## master #98 +/- ##
======================================
Coverage 58.9% 58.9%
======================================
Files 38 38
Lines 2363 2363
======================================
Hits 1394 1394
Misses 969 969
Flag | Coverage Δ | |
---|---|---|
#clang | 68.5% <ø> (ø) |
:arrow_up: |
#doxygen | 19.4% <ø> (ø) |
:arrow_up: |
#gcc | 96.6% <ø> (ø) |
:arrow_up: |
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact)
,ø = not affected
,? = missing data
Powered by Codecov. Last update 57ed667...b5ee451. Read the comment docs.
Is LANL requiring this?
@tcgermann and @FCI-LANL know more, but the short answer is yes.
I should add the code number in the readme.
@junghans Does it mean that it has passed LANL approval?
If LANL requires this, then we should also add copyright assertion lines for all contributing institutions (ORNL, PPPL, LLNL, SNL, ...), as well as their accompanying paragraph. If this is really what LANL wants/requires, we should use a separate LICENSE file rather than repeat the same 100 lines in each file. Or is this the model we should follow: https://github.com/E3SM-Project/E3SM/blob/master/LICENSE
I agree with @tcgermann - we want the optics here to be that this is a team effort.
Ok, I think we can do that. Keep the individual file under Cabana auhors and define the authors in the license file. However, we still need to keep the government clause in license file.
Does that sound reasonable?
@FCI-LANL any comments?
No problem with listing the other authoring organizations and labs. Having separate license file to include the full authors, BSD text, and gov use language is fine. Thanks!
Kaelyn
From: Christoph Junghans [mailto:notifications@github.com] Sent: Wednesday, March 27, 2019 7:32 AM To: ECP-copa/Cabana Cabana@noreply.github.com Cc: Badura, Kaelyn Skye kbadura@lanl.gov; Mention mention@noreply.github.com Subject: Re: [ECP-copa/Cabana] added LANL copyright (#98)
Ok, I think we can do that. Keep the individual file under Cabana auhors and define the authors in the license file. However, we still need to keep the government clause in license file.
Does that sound reasonable?
@FCI-LANLhttps://github.com/FCI-LANL any comments?
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://github.com/ECP-copa/Cabana/pull/98#issuecomment-477155580, or mute the threadhttps://github.com/notifications/unsubscribe-auth/AWCgBeIxdo0FSmKm-rHaXd1aqy-r3bfjks5va3LrgaJpZM4cAK2E.
@tcgermann @sslattery better?
git log | grep Author | sed 's/.*@//' | sort -u
is what I did, no contribution from SNL yet.
Fair enough
Added anyhow, now ready to merge!
@tcgermann please review.
Looks better, can we go ahead and modify the paragraph as Kaelyn suggests below (we'd need to get the contractor and contract # for each lab):
Assuming the other labs have gone through the assertion process, the language below can be revised to:
© (or copyright) 2019. Triad National Security, LLC. All rights reserved. © (or copyright) (year of assertion). Lab #2 Contractor/Operator. All rights reserved. © (or copyright) (year of assertion). Lab #3 Contractor/Operator. All rights reserved.
This program was produced under U.S. Government contract 89233218CNA000001 for Los Alamos National Laboratory (LANL), U.S. Government Contract ####### for Lab #2, and U.S. Government Contract ####### for Lab #3…
@tcgermann good point!
@sslattery, can you add the data for ORNL? @streeve, can you add the data for LLNL? @stanmoore1, can you add the data for SNL?
@ascheinb Can you add PPPL info as well?
For LLNL:
This program was produced under [...] U.S. Government Contract DE-AC52-07NA27344 for Lawrence Livermore National Laboratory (LLNL) [...]
Our plan is to include the auspices statement, but otherwise contribute to the open source project without an LLNL specific copyright
I am asking PPPL what our statement should be. They want to know if it's open source - just to be clear, that's a yes, right?
Yes - open source with a BSD 3-clause license
ORNL Contractor: UT-Battelle ORNL Contract #: DE-AC05- 00OR22725
Sandia Contractor: NTESS Sandia Contract #: DE-NA-0003525 I will ask around about copyright assertion.
@ascheinb any update on the PPPL language?
Yes, Stephane and I received this verdict:
We have consulted with Princeton's OGC and the way you have listed your shared rights as part of the development group is fine, legally, but the following pieces of advice were also passed on:
The license should list the authors under the “Copyright 2018-2019 the Cabana authors” line for clarity There is a variation of the BSD 3-Clause license that adds: “NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS LICENSE.” See BSD 3-Clause Clear License (https://choosealicense.com/licenses/bsd-3-clause-clear/). This may provide additional protection if PPPL (or DOE, or any of the other national lab collaborators) have patents, or anticipate filing patents, on inventions related to this code, avoiding modifications of the code that could infringe PPPL/DOE/etc. patents. However, a potential downside to the BSD 3-Clause Clear License is that others may be reluctant to use or build on the code if they are worried about potentially infringing a related patent.
@junghans what's the best way to incorporate the PPPL comments?
@sslattery I hoped you would know ;-)
Yeah I wasn't sure what to do with it either. But they do say the existing version is "fine" so I guess we don't have to do anything. :)
I say then that we leave as is based on PPPL legal response. If we need to change in the future then this PR can serve as a reference to PPPL's suggestion after it is closed.
To Do, add contract numbers for: