-
Notifications
You must be signed in to change notification settings - Fork 54
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
python2 to 3 conversion backport to b4.4 #1451
Conversation
@jennfshr @tom95858 - Please, in the future ensure that backports are strict one-to-one commit backports instead of merging multiple commits together for a port. It is much more difficult to look at the branch histories and see what has been synced if the backported commits don't each appear in the "git log --oneline" log with subject lines that are substantially the same (maybe just a backport note appened to the subject line). |
I created that port by doing a git diff on the changed files from the OVIS-4 branch to the b4.4 branch, then applying the patch to a clone of the b4.4 branch. In hindsight, I should have squashed (I thought I marked it as such w/ my OVIS-4 pull request) the commits for the initial python2->3 port, then a single commit comparison for both branches would have been more straightforward. I see what you mean and appreciate the constructive feedback.
From: Christopher J. Morrone ***@***.***>
Date: Monday, October 14, 2024 at 4:57 PM
To: ovis-hpc/ldms ***@***.***>
Cc: Green, Jennifer Kathleen ***@***.***>, Mention ***@***.***>
Subject: [EXTERNAL] Re: [ovis-hpc/ldms] python2 to 3 conversion backport to b4.4 (PR #1451)
@jennfshr<https://github.com/jennfshr> @tom95858<https://github.com/tom95858> - Please, in the future ensure that backports are strict one-to-one commit backports instead of merging multiple commits together for a port. It is much more difficult to look at the branch histories and see what has been synced if the backported commits don't each appear in the "git log --oneline" log with subject lines that are substantially the same (maybe just a backport note appened to the subject line).
—
Reply to this email directly, view it on GitHub<#1451 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AAGPTURDUZK26VWUNCA4AFLZ3RD4XAVCNFSM6AAAAABOZHEO2WVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDIMJSGQ3TKNZWHA>.
You are receiving this because you were mentioned.Message ID: ***@***.***>
|
@jennfshr The best way to do a backport (or forward port) is to start with the "git cherry-pick" command. I think you'll find that makes your life much easier, because you won't need to do all of that manual diff+patching. You can let git do the work (including preserving original commit message and authorship), and just resolve any commit conflicts. And it does look like something went wrong in this backport, because we are missing at least the ovis-roll-over.py python2->python3 changes. |
I can squash it when I accept the pull request. That said, have we confirmed that we need or use any of these scripts? I mean they haven't worked for more than a few years, so why are we maintaining them? |
Ben tested (and fixed) my port of these scripts. I think that revisiting their usefulness is a good idea, as well as further testing/peer review. I think that we do use some of them (i.e., the ldms_sensors_config script we actively use) @baallan has way more experience than I do on this. My motivation for updating them was so rpm wasn’t forcing a python2 requirement.
|
@tom95858 yes we have confirmed that we need them. all but the mpi are in routine use; the mpi supports a research plugin with episodic use. |
Pulling in the changes to bring python2 to python3 into the b4.4 branch. @baallan