Skip to content

Conversation

@xylar
Copy link
Contributor

@xylar xylar commented Oct 2, 2025

Summary

Objectives:

  • Modernize packaging but switching from setup.cfg and setup.py to pyproject.toml
  • Remove a deprecated option in pre-commit config

Select one: This pull request is...

  • a bug fix: increment the patch version
  • a small improvement: increment the minor version
  • a new feature: increment the minor version
  • an incompatible (non-backwards compatible) API change: increment the major version

Please fill out either the "Small Change" or "Big Change" section (the latter includes the numbered subsections), and delete the other.

Small Change

  • To merge, I will use "Squash and merge". That is, this change should be a single commit.
  • Logic: I have visually inspected the entire pull request myself.
  • Pre-commit checks: All the pre-commits checks have passed.

@xylar xylar marked this pull request as draft October 2, 2025 09:06
@xylar
Copy link
Contributor Author

xylar commented Oct 2, 2025

Needs to be rebased after #735

@forsyth2
Copy link
Collaborator

forsyth2 commented Oct 2, 2025

Thanks @xylar! I reviewed the new commit (e03e7f6). And I see the GitHub Actions are passing for 3.11, 3.12, 3.13.

Once @tomvothecoder signs off on #735, we can merge that one, and then this PR. (I think because the first 6 commits are included in #735, they should just disappear once #735 is merged, but yes rebasing and pushing again would also work).

@xylar
Copy link
Contributor Author

xylar commented Oct 2, 2025

(I think because the first 6 commits are included in #735, they should just disappear once #735 is merged, but yes rebasing and pushing again would also work).

They won't disappear without a rebase so that will be cleaner.

@forsyth2
Copy link
Collaborator

forsyth2 commented Oct 2, 2025

@xylar I just merged https://github.com/E3SM-Project/zppy/pull/739/commits, so you can rebase and merge.

They won't disappear without a rebase

Yes, I see they haven't disappeared. I definitely thought I've seen that happen before though. Maybe a different case.

@xylar xylar force-pushed the switch-to-pyproject-toml branch from e03e7f6 to 8b0e427 Compare October 2, 2025 19:59
@xylar
Copy link
Contributor Author

xylar commented Oct 2, 2025

Yes, I see they haven't disappeared. I definitely thought I've seen that happen before though. Maybe a different case.

The only context I can imagine that working is if the commits get added to main without a merge commit (or a squash commit). Since I never work with branches with that kind of linear history, I haven't seen that before.

@xylar xylar marked this pull request as ready for review October 2, 2025 20:01
@xylar
Copy link
Contributor Author

xylar commented Oct 2, 2025

In any case, this is rebased and ready for review. Please make sure I didn't accidentally undo any of your most recent changes. I don't think so.

@forsyth2
Copy link
Collaborator

forsyth2 commented Oct 2, 2025

The only context I can imagine that working

Hmm maybe I simply forgot that it required a rebase first; in any case, not a big deal.

this is rebased and ready for review. Please make sure I didn't accidentally undo any of your most recent changes. I don't think so.

Yes, this looks good to me, thanks!

@forsyth2 forsyth2 merged commit e10d0e6 into E3SM-Project:main Oct 2, 2025
6 checks passed
@xylar xylar deleted the switch-to-pyproject-toml branch October 2, 2025 21:16
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