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

Issue555 inclusive license #613

Merged
merged 8 commits into from
Dec 12, 2018
Merged

Issue555 inclusive license #613

merged 8 commits into from
Dec 12, 2018

Conversation

guyer
Copy link
Member

@guyer guyer commented Nov 27, 2018 •
edited
Loading

Fixes #555

This change is Reviewable

@guyer guyer requested review from tkphd and wd15 November 27, 2018 23:04
@guyer guyer added this to the 3.2 milestone Nov 27, 2018
tkphd
tkphd previously requested changes Nov 30, 2018
View reviewed changes
Copy link
Contributor

@tkphd tkphd left a comment

Choose a reason for hiding this comment

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

Reviewed 395 of 395 files at r1.
Reviewable status: all files reviewed, 8 unresolved discussions (waiting on @guyer and @wd15)

LICENSE.rst, line 2 at r1 (raw file):

------------
Terms of Use

Exactly duplicates Director's Statement, with helpful links. LGTM.

examples/benchmarking/solvers/analyze.ipynb, line 1 at r1 (raw file):

{

This appears to be a new file, which is inconsistent with apparent intent of this PR. Please either document or remove.

examples/benchmarking/solvers/.ipynb_checkpoints/analyze-checkpoint.ipynb, line 0 at r1 (raw file):
IPython Notebook checkpoints definitely do not belong in the repo. Please remove.

fipy/requirements.txt, line 1 at r1 (raw file):

matplotlib==2.2.2

This appears to be a new file, which is inconsistent with the apparent intent of this PR. Was it intentionally checked in?

fipy/terms/vanLeerConvectionTerm.py, line 47 at r1 (raw file):

 ##

"""

Empty block-quote should probably also be scrubbed.

fipy/tools/decorators.py, line 45 at r1 (raw file):

 # any modified versions bear some notice that they have been modified.
 # ========================================================================
 # Portions of this code are copied and/or derived from numpy.lib.utils

This copyright notice should be retained.

fipy/tools/dimensions/physicalField.py, line 44 at r1 (raw file):

 # any modified versions bear some notice that they have been modified.
 # ========================================================================
 #  Copyright 1997-2006 by Konrad Hinsen, except as noted below.

This copyright notice should be retained.

fipy/tools/performance/efficiencyTestHistory.py, line 1 at r1 (raw file):

##This script runs on using "file", which is created with the command $svn log --xml --incremental > file

Erm, what's all this about? Perhaps scrub the whole thing?

guyer added 4 commits November 30, 2018 15:54
@guyer
Remove files added in error
f366619
@guyer
Remove empty block quote
3f66c3e
@guyer
Restore numpy license
11256d8 
Portions of code copied from numpy
@guyer
Restore credit to Konrad Hinsen and Greg Ward
e1bea30 
License text not restored to source code as it is in LICENSE file
alongside.
Updated some links.
@guyer
Copy link
Member Author

guyer commented Nov 30, 2018

fipy/tools/dimensions/physicalField.py, line 44 at r1 (raw file):

Previously, tkphd (Trevor Keller) wrote…

This copyright notice should be retained.

I did not retain the copyright notice, as it's in fipy/tools/dimensions/LICENSE, but did restore credit lines for Konrad Hinsen and Greg Ward, as given in the current version of their source

@guyer
Copy link
Member Author

guyer commented Nov 30, 2018

fipy/tools/performance/efficiencyTestHistory.py, line 1 at r1 (raw file):

Previously, tkphd (Trevor Keller) wrote…

Erm, what's all this about? Perhaps scrub the whole thing?

To keep this pull request atomic, I'm letting this ride, but filed #614 to deal with it

@guyer
Copy link
Member Author

guyer commented Nov 30, 2018

fipy/requirements.txt, line 1 at r1 (raw file):

Previously, tkphd (Trevor Keller) wrote…

This appears to be a new file, which is inconsistent with the apparent intent of this PR. Was it intentionally checked in?

Done.

@guyer
Copy link
Member Author

guyer commented Nov 30, 2018

examples/benchmarking/solvers/.ipynb_checkpoints/analyze-checkpoint.ipynb, line at r1 (raw file):

Previously, tkphd (Trevor Keller) wrote…

IPython Notebook checkpoints definitely do not belong in the repo. Please remove.

Done.

@guyer
Copy link
Member Author

guyer commented Nov 30, 2018

examples/benchmarking/solvers/analyze.ipynb, line 1 at r1 (raw file):

Previously, tkphd (Trevor Keller) wrote…

This appears to be a new file, which is inconsistent with apparent intent of this PR. Please either document or remove.

Done.

@guyer
Copy link
Member Author

guyer commented Nov 30, 2018

LICENSE.rst, line 2 at r1 (raw file):

Previously, tkphd (Trevor Keller) wrote…

Exactly duplicates Director's Statement, with helpful links. LGTM.

Done.

@guyer
Copy link
Member Author

guyer commented Nov 30, 2018

fipy/terms/vanLeerConvectionTerm.py, line 47 at r1 (raw file):

Previously, tkphd (Trevor Keller) wrote…

Empty block-quote should probably also be scrubbed.

Done.

@guyer
Copy link
Member Author

guyer commented Nov 30, 2018

fipy/tools/decorators.py, line 45 at r1 (raw file):

Previously, tkphd (Trevor Keller) wrote…

This copyright notice should be retained.

Done.

guyer
guyer commented Nov 30, 2018
View reviewed changes
Copy link
Member Author

@guyer guyer left a comment

Choose a reason for hiding this comment

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

I don't know whether it's Reviewable or GitHub, but something is making it very opaque to ask you to re-review.

Re-review, please.

@guyer guyer dismissed tkphd’s stale review November 30, 2018 22:06

I'm dismissing @tkphd's review because I can't figure out any other way to acknowledge the damed thing!!!

@guyer guyer requested a review from tkphd November 30, 2018 22:06
tkphd
tkphd approved these changes Dec 4, 2018
View reviewed changes
Copy link
Contributor

@tkphd tkphd left a comment

Choose a reason for hiding this comment

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

Reviewable status: 389 of 393 files reviewed, 2 unresolved discussions (waiting on @tkphd and @wd15)

tkphd
tkphd approved these changes Dec 10, 2018
View reviewed changes
Copy link
Contributor

@tkphd tkphd left a comment

Choose a reason for hiding this comment

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

Reviewed 4 of 4 files at r3.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

tkphd
tkphd requested changes Dec 12, 2018
View reviewed changes
LICENSE.rst
.. _the website: https://www.ctcms.nist.gov/fipy
.. _this repository: https://github.com/usnistgov/fipy
.. _title 17 section 105: http://uscode.house.gov/uscode-cgi/fastweb.exe?getdoc+uscview+t17t20+9+0++
.. _title 17 United States Code Section 105: http://uscode.house.gov/uscode-cgi/fastweb.exe?getdoc+uscview+t17t20+9+0++
Copy link
Contributor

Choose a reason for hiding this comment

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

Link is broken. Please substitute
https://www.copyright.gov/title17/92chap1.html#105

Copy link
Contributor

Choose a reason for hiding this comment

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

... or, to stay within uscode.house.gov, please use
http://uscode.house.gov/view.xhtml?req=granuleid:USC-prelim-title17-section105&num=0&edition=prelim

Copy link
Contributor

Choose a reason for hiding this comment

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

... or, use the Government Publishing Office (requires specifying the year)
https://www.gpo.gov/fdsys/pkg/USCODE-2017-title17/html/USCODE-2017-title17-chap1-sec105.htm

Copy link
Member Author

Choose a reason for hiding this comment

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

sigh That's not what "tkphd approved these changes 2 days ago" means.

@guyer guyer merged commit 7d4cfd3 into usnistgov:develop Dec 12, 2018
guyer added a commit that referenced this pull request Dec 12, 2018
@guyer
Fix link to 17 U.S.C. 105
fcd22ac 
FIx broken link [identified](#613 (review)) by @tkphd
@guyer guyer deleted the issue555-inclusive_license branch December 13, 2018 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tkphd tkphd tkphd requested changes

@wd15 wd15 wd15 approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@guyer @wd15 @tkphd