Looks like there's a few other places this needs fixing (I would mark this as needs changes if I could).

Sorry I missed these in #15168 😞 .

I have been busy recently and lost track of things, but it looks like this is not going to be fixed upstream so we need to get these fixes in, backported to 3.1.x and 2.2.x and get both tagged this weekend. I guess that is what I am doing on Sunday...

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 ca9a411030178b12e15ee525da0c2385dbcb8dbb

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

$ git commit -am 'Backport PR #15403: Fix DeprecationWarning in nightly testing'

4. Push to a named branch :

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

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

"Backport PR #15403 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.

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 v3.1.x
$ git pull

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

$ git cherry-pick -m1 ca9a411030178b12e15ee525da0c2385dbcb8dbb

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

$ git commit -am 'Backport PR #15403: Fix DeprecationWarning in nightly testing'

4. Push to a named branch :

git push YOURFORK v3.1.x:auto-backport-of-pr-15403-on-v3.1.x

5. Create a PR against branch v3.1.x, I would have named this PR:

"Backport PR #15403 on branch v3.1.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'm looking at the backports, hopefully this is the same as #15168 and these code-paths don't exist on 2.2.x or 3.1.x.

Yeah, these 3 are not on either 3.1.x or 2.2.x.

These came in via a60ac1a via #14609.