Skip to content

Start testing on current Python versions.#559

Merged
Carreau merged 1 commit intoipython:masterfrom
Carreau:test-recent
May 31, 2020
Merged

Start testing on current Python versions.#559
Carreau merged 1 commit intoipython:masterfrom
Carreau:test-recent

Conversation

@Carreau
Copy link
Copy Markdown
Member

@Carreau Carreau commented May 31, 2020

No description provided.

@Carreau Carreau merged commit 39f3bd8 into ipython:master May 31, 2020
@Carreau Carreau deleted the test-recent branch May 31, 2020 04:51
@Carreau
Copy link
Copy Markdown
Member Author

Carreau commented May 31, 2020

@meeseeksdev backport to 4.x

@lumberbot-app
Copy link
Copy Markdown
Contributor

lumberbot-app Bot commented May 31, 2020

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 4.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 39f3bd8ea844bf2367c6b2b7d29535f5d84b6806
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #559: Start testing on current Python versions.'
  1. Push to a named branch :
git push YOURFORK 4.x:auto-backport-of-pr-559-on-4.x
  1. Create a PR against branch 4.x, I would have named this PR:

"Backport PR #559 on branch 4.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@Carreau Carreau added this to the 5.0 milestone Jun 4, 2020
@Carreau Carreau added 5.0-re-review Need to re-review for potential API impact changes. and removed 5.0-re-review Need to re-review for potential API impact changes. Still Needs Manual Backport labels Jun 4, 2020
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.

1 participant