Skip to content

skpkg: migrate src folder, migrate test folder #23

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
Merged
sbillinge merged 4 commits into from
Oct 7, 2025
Merged

skpkg: migrate src folder, migrate test folder #23

sbillinge merged 4 commits into from
Oct 7, 2025

Conversation

@stevenhua0320
Copy link
Contributor

@stevenhua0320 stevenhua0320 commented Oct 6, 2025 •
edited
Loading

@zmx27 Ready for review
Left to do: after PR #22 merged, add imageplot.py into migration if anything changed
Update: No more change to imageplot.py after #22, no need to add the file again.

zmx27
zmx27 reviewed Oct 7, 2025
View reviewed changes
Copy link
Collaborator

@zmx27 zmx27 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

See comments, otherwise it looks good to me

Also, there's not really a lot of tests for this package currently, but it might be a good sanity check to run pytest anyway

src/diffpy/__init__.py Outdated
# dpx.pdfgetxgui by Simon J. L. Billinge group
# (c) 2012 Trustees of the Columbia University
# in the City of New York. All rights reserved.
# (c) 2025 The Trustees of Columbia University in the City of New York.
Copy link
Collaborator

@zmx27 zmx27 Oct 7, 2025

Choose a reason for hiding this comment

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

This should be 2012-2025. In general, it will go from the old date to the current date.

src/diffpy/__init__.py Outdated
# All rights reserved.
#
# File coded by: Xiaohao Yang
# File coded by: Billinge Group members and community contributors.
Copy link
Collaborator

@zmx27 zmx27 Oct 7, 2025

Choose a reason for hiding this comment

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

I think just Billinge Group members, but add back Xiaohao Yang. So something like Xiaohao Yang and Billinge Group members

src/diffpy/srxplanargui/__init__.py Outdated
# dpx.pdfgetxgui by Simon J. L. Billinge group
# (c) 2012 Trustees of the Columbia University
# in the City of New York. All rights reserved.
# (c) 2025 The Trustees of Columbia University in the City of New York.
Copy link
Collaborator

@zmx27 zmx27 Oct 7, 2025

Choose a reason for hiding this comment

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

Same here

src/diffpy/srxplanargui/__init__.py Outdated
# All rights reserved.
#
# File coded by: Xiaohao Yang
# File coded by: Rundong Hua, Simon Billinge, Billinge Group members.
Copy link
Collaborator

@zmx27 zmx27 Oct 7, 2025

Choose a reason for hiding this comment

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

Same here

src/diffpy/srxplanargui/version.py Outdated
# All rights reserved.
#
# File coded by: Xiaohao Yang
# File coded by: Rundong Hua, Simon Billinge, Billinge Group members.
Copy link
Collaborator

@zmx27 zmx27 Oct 7, 2025

Choose a reason for hiding this comment

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

Same here

src/diffpy/srxplanargui/version.py Outdated
# Simon J. L. Billinge
# (c) 2010 Trustees of the Columbia University
# in the City of New York. All rights reserved.
# (c) 2025 The Trustees of Columbia University in the City of New York.
Copy link
Collaborator

@zmx27 zmx27 Oct 7, 2025

Choose a reason for hiding this comment

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

Same here

@stevenhua0320
Copy link
Contributor Author

stevenhua0320 commented Oct 7, 2025

@zmx27 Ready for review

zmx27
zmx27 reviewed Oct 7, 2025
View reviewed changes
src/diffpy/srxplanargui/__init__.py Outdated
# All rights reserved.
#
# File coded by: Xiaohao Yang
# File coded by: Xiaohao Yang, Simon Billinge, Billinge Group members.
Copy link
Collaborator

@zmx27 zmx27 Oct 7, 2025

Choose a reason for hiding this comment

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

I think just Xiaohao Yang and Billinge Group members. Same for the other places where this shows up

Copy link
Collaborator

@zmx27 zmx27 Oct 7, 2025

Choose a reason for hiding this comment

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

Otherwise, this looks good. Also, did you run pytest yet? Maybe paste the results in this PR. It's not going to test much, but I still think it's a good sanity check to make sure that everything passes

@stevenhua0320
Copy link
Contributor Author

stevenhua0320 commented Oct 7, 2025

The pytest is here, run correctly.
pytest ===================================================================== test session starts ====================================================================== platform darwin -- Python 3.13.7, pytest-8.4.2, pluggy-1.6.0 rootdir: /Users/huarundong/dbs/diffpy.srxplanargui/diffpy.srxplanargui configfile: pyproject.toml plugins: env-1.1.5, cov-7.0.0 collected 1 item tests/test_version.py . [100%] ====================================================================== 1 passed in 0.02s =======================================================================

@stevenhua0320 stevenhua0320 changed the title skpkg: migrate src folder except imageplot.py, migrate test folder skpkg: migrate src folder, migrate test folder Oct 7, 2025
@sbillinge sbillinge merged commit f94a158 into diffpy:migration Oct 7, 2025
1 check failed
@sbillinge sbillinge deleted the setup-CI-3 branch October 7, 2025 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@zmx27 zmx27 zmx27 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@stevenhua0320 @zmx27 @sbillinge