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

WIP: Move to numpy.Generators #6899

Draft
wants to merge 7 commits into
base: dev
Choose a base branch
from

Fix imports

4ed3805
Select commit
Loading
Failed to load commit list.
Draft

WIP: Move to numpy.Generators #6899

Fix imports
4ed3805
Select commit
Loading
Failed to load commit list.
DCO / DCO required action Aug 31, 2023 in 1s

DCO

There are 3 commits incorrectly signed off. This means that the author(s) of these commits failed to include a Signed-off-by line in their commit message.

To avoid having PRs blocked in the future, always include Signed-off-by: Author Name <[email protected]> in every commit message. You can also do this automatically by using the -s flag (i.e., git commit -s).

Here is how to fix the problem so that this code can be merged.


Preferred method: Commit author adds a DCO remediation commit

A DCO Remediation Commit contains special text in the commit message that applies a missing Signed-off-by line in a subsequent commit. The primary benefit of this method is that the project’s history does not change, and there is no risk of breaking someone else’s work.

These authors can unblock this PR by adding a new commit to this branch with the following text in their commit message:

John Zielke <[email protected]>

DCO Remediation Commit for John Zielke <[email protected]>

I, John Zielke <[email protected]>, hereby add my Signed-off-by to this commit: 62518079d7dd62ce9b6d7f0cc8a97b1ba4fc46ff
I, John Zielke <[email protected]>, hereby add my Signed-off-by to this commit: 3372f89fae590b1653fd45b1de67faf7ee6099ce
I, John Zielke <[email protected]>, hereby add my Signed-off-by to this commit: c564deda2c33e487d92ef0f513e89f7133b1cafe

Signed-off-by: John Zielke <[email protected]>

Please note: You should avoid adding empty commits (i.e., git commit -s --allow-empty), because these will be discarded if someone rebases the branch / repo.


Least preferred method: Rebase the branch

If you have a local git environment and meet the criteria below, one option is to rebase the branch and add your Signed-off-by lines in the new commits. Please note that if others have already begun work based upon the commits in this branch, this solution will rewrite history and may cause serious issues for collaborators (described in the git documentation under "The Perils of Rebasing").

You should only do this if:

  • You are the only author of the commits in this branch
  • You are absolutely certain nobody else is doing any work based upon this branch
  • There are no empty commits in the branch (for example, a DCO Remediation Commit which was added using --allow-empty)

To add your Signed-off-by line to every commit in this branch:

  1. Ensure you have a local copy of your branch by checking out the pull request locally via command line.
  2. In your local branch, run: git rebase HEAD~7 --signoff
  3. Force push your changes to overwrite the branch: git push --force-with-lease origin 6854-replace-np-randomstate-with-np-random-generator

Summary

Commit sha: 6251807, Author: John Zielke, Committer: John Zielke; The sign-off is missing.
Commit sha: 3372f89, Author: John Zielke, Committer: John Zielke; The sign-off is missing.
Commit sha: c564ded, Author: John Zielke, Committer: John Zielke; The sign-off is missing.