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

python2 to 3 conversion backport to b4.4 #1451

Merged
merged 1 commit into from
Oct 7, 2024
Merged

Conversation

jennfshr
Copy link
Collaborator

Pulling in the changes to bring python2 to python3 into the b4.4 branch. @baallan

@tom95858 tom95858 merged commit d22128a into ovis-hpc:b4.4 Oct 7, 2024
14 checks passed
@morrone
Copy link
Collaborator

morrone commented Oct 14, 2024

@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).

@jennfshr
Copy link
Collaborator Author

jennfshr commented Oct 15, 2024 via email

@morrone
Copy link
Collaborator

morrone commented Oct 15, 2024

@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.

@tom95858
Copy link
Collaborator

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?

@jennfshr
Copy link
Collaborator Author

jennfshr commented Oct 15, 2024 via email

@baallan
Copy link
Collaborator

baallan commented Oct 15, 2024

@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.

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.

4 participants