Fix ordering of format controls to preserve behavior of pip

[sethmlarson]

Contributor checklist

• Included tests for the changes.
• PR title is short, clear, and ready to be included in the user-facing changelog.

Maintainer checklist

• Verified one of these labels is present: backwards incompatible, feature, enhancement, deprecation, bug, dependency, docs or skip-changelog as they determine changelog listing.
• Assign the PR to an existing or new milestone for the target version (following Semantic Versioning).

Closes #2081

[webknjaz]

@sethmlarson this looks good but could you rewrite the test to use parametrize? It seems to me that this is smashing to standalone tests into the same function which is discouraged.

[sethmlarson]

Thanks for the review @webknjaz, I've restructured the test to use parametrization :)

[webknjaz]

@sethmlarson could you fix the linting offenses (change lists to tuples in tests). I'll enable auto-merge, meanwhile.

[sethmlarson]

@webknjaz Looks like automerge gets disabled if I push, you might have to enable again.

[webknjaz]

No problem! The CI run also needed approval.

[webknjaz]

Looks like compatibility with Pip's main need to be fixed first, which is a blocker. I didn't realize it's not only failing in the nightly runs..