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

Flake8 fixes pt1 #124

Closed
wants to merge 12 commits into from
Closed

Flake8 fixes pt1 #124

wants to merge 12 commits into from

Conversation

cadenmyers13
Copy link
Contributor

No description provided.

Copy link
Contributor

@sbillinge sbillinge left a comment

Choose a reason for hiding this comment

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

Please see comment. O may have more but about to jump on a train

src/diffpy/pdfgui/gui/windowperspective.py Show resolved Hide resolved
Copy link
Contributor

@sbillinge sbillinge left a comment

Choose a reason for hiding this comment

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

I hate to say this, but I think these are all wrong. We don't want to update copyright statements to either MSU or BNL, only adding/updating statements to Columbia.

The basic idea is that the copyright is owned by the entity that made the changes. Right now, since we are Columbia, Columbia owns copyright to changes we are making to the code now, but BNL/MSU don't have copyright for edits we are doing now (but still have copyright for the work done before), if you see what I mean.

@@ -40,7 +40,7 @@
computer programs for studying nanostructure in crystals,
J. Phys.: Condens. Matter 19, 335219 (2007)."""

_copyright = "(c) 2005-{year},".format(year=__date__[:4])
_copyright = "(c) 2005-2024-{year},".format(year=__date__[:4])
Copy link
Contributor

Choose a reason for hiding this comment

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

this one probably doesn't need up updating. the {year} is doing that work.

@sbillinge sbillinge closed this Jul 26, 2024
@sbillinge sbillinge reopened this Jul 26, 2024
@sbillinge
Copy link
Contributor

reopening. Sorry, we just need to revert the copyright work on this PR. I think the rest is ok.

Let's put all the copyright work on separate PRs.

@cadenmyers13
Copy link
Contributor Author

I hate to say this, but I think these are all wrong. We don't want to update copyright statements to either MSU or BNL, only adding/updating statements to Columbia.

The basic idea is that the copyright is owned by the entity that made the changes. Right now, since we are Columbia, Columbia owns copyright to changes we are making to the code now, but BNL/MSU don't have copyright for edits we are doing now (but still have copyright for the work done before), if you see what I mean.

Ahh. I was wrestling with this earlier trying to revert my commits back to fix this. I thought I got it fixed in the PR but looks like I didn't😭. I will get this fixed. It's not too much work since I can search globally (command+f) on VS code and replace.

@sbillinge
Copy link
Contributor

this branch has conflicts too that needs resolving. We are approaching a point where it may be better to open a clean branch and redo the edits...... Especially since this will also include hte new work to get CI running.

@cadenmyers13 cadenmyers13 deleted the flake8 branch July 31, 2024 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants