@abhinuvpitale Thanks so much for your contributions. I took the liberty of formatting your title and the start of your PR desc. We don't need the Issue # in the PR title, but a "closes #xxxxx" in the body of the PR description allows the automatic issue closing system to work. Thanks again!

@jklymak added flake8 corrections, I should hope that it passes the ci
thanks for change in title!

@jklymak not sure why travis-ci has failed on macos, can you help me with it?

@meeseeksdev backport to v2.2.4

Something went wrong ... Please have a look at my logs.

It seem that the branch you are trying to backport to does not exists.

@meeseeksdev backport to v2.2.x

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 v2.2.x
$ git pull

2. Cherry pick the first parent branch of the this PR on top of the older branch:

$ git cherry-pick -m1 ed2740821c37b597e865e1483629e873c4488dc6

3. You will likely have some merge/cherry-pick conflict here, fix them and commit:

$ git commit -am 'Backport PR #12261: FIX:  parasite axis2 demo'

4. Push to a named branch :

git push YOURFORK v2.2.x:auto-backport-of-pr-12261-on-v2.2.x

5. Create a PR against branch v2.2.x, I would have named this PR:

"Backport PR #12261 on branch v2.2.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.

I tried to backport to v2.2.x, because

• this is a regression to 2.1
• a user (@lupien) requested this in parasite axis2 demo now crashes with log x-axis #12208 (comment)
• it looked easy to backport due to only a single line being affected

but the suggested git cherry-pick -m1 ed2740821c37b597e865e1483629e873c4488dc6 fails with
error: mainline was specified but commit ed2740821c37b597e865e1483629e873c4488dc6 is not a merge.

At this point this is probably beyond my paygrade, but happy to continue with it if someone wants to talk me through.

It's because you did a squash merge, so there is only one parent (it's not a merge commit.) You don't need to specify -m1 in that case.

My Fault, I haven't implemented support for squash-merge into the bot. PR welcome.

If I follow this further (leaving out -m1) and pushing to git push origin v2.2.x, it'll create a PR with some 21 commits and 14 changed files from all kinds of different authors, instead of only 1 commit (2 files) that this should include. Maybe YOURFORK should be something else? 🍴

21 commits and 14 changed files from all kinds of different authors

That seem wrong this PR is 5 commits, and when you squashed you only got 1, so you should only get one in the end:

 ~/dev/matplotlib[v2.2.x ✓] $ git checkout v2.2.x
Already on 'v2.2.x'
Your branch is up to date with 'origin/v2.2.x'.
 ~/dev/matplotlib[v2.2.x ✓] $ git pull
Already up to date.
 ~/dev/matplotlib[v2.2.x ✓] $ git cherry-pick ed2740821c37b597e865e1483629e873c4488dc6
error: could not apply ed2740821... FIX:  parasite axis2 demo (#12261)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
$ # Fix conflicts
$ git commit -a

And push that to whatever your fork is. I usually can't know what the name of the remote for your fork is, for me it's named github, for some it's origin.

I'm not sure what "something else" would be, it has to be interpreted by the person running the command.

When you tried to open a PR, was the base branch v2.2.x or master?

When you tried to open a PR, was the base branch v2.2.x or master?

Ups.. 🤣 I guess one has to make this mistake once, to never do it again. It's all good now. Seems the problem is the web interface which is set to "master" by default even it you're pushing to another branch.

@QuLogic Does the newly created PR need new reviews or is it usual to just merge it directly after tests have been completed?