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

Untrack files and pyproject.toml edit #9

Merged
merged 3 commits into from
Jul 28, 2024
Merged

Conversation

stevenhua0320
Copy link
Contributor

  1. Add those rst untrack files for authors, license, code_of_conduct etc.
  2. edit the pyproject.toml in accordance with srmise info

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.

This is good. In the license file I think we need a copyright statement for 2015 for the trustees of Michigan State University everwhere the license appears, as well as the existing Columbia 2024 statement.

Otherwise, I think I can merge this, but I want to merge the p2 -> p3 branch first when it passes tests.

Try and get that one to pass tests locally after merging upstream/p3 into it. It is ok to make intermediate pushes with tests not passing, but try and do debugging work by running tests locally, not using CI for that.

@sbillinge sbillinge changed the base branch from main to p3 July 28, 2024 16:07
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 can merge this one after we fix the couple of inline comments. I will look for an email for Luke if I can find it and you can add that to the authors in the toml file

=============================
BSD 3-Clause License

Copyright (c) 2024, The Trustees of Columbia University in
Copy link
Contributor

Choose a reason for hiding this comment

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

This also needs the updated copyright statements

name = "diffpy.srmise"
dynamic=['version']
authors = [
{ name="Simon J.L. Billinge group", email="simon.billinge@gmail.com" },
Copy link
Contributor

Choose a reason for hiding this comment

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

let's add luke granlund to this.

@sbillinge sbillinge merged commit 75e5111 into diffpy:p3 Jul 28, 2024
0 of 3 checks passed
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