STYLE Reduce merge conflicts with force_grid_wrap=1

[MarcoGorelli]

• closes STYLE Reduce merge conflicts with force_single_line or force_grid_wrap=1 #50274 (Replace xxxx with the GitHub issue number)
• Tests added and passed if fixing a bug or adding a new feature
• All code checks passed.
• Added type annotations to new arguments/methods/functions.
• Added an entry in the latest doc/source/whatsnew/vX.X.X.rst file if fixing a bug or adding a new feature.

Exact commands I ran:

git fetch upstream
git reset --hard upstream/main
sed -i 's/force_grid_wrap = 2/force_grid_wrap = 1/g' pyproject.toml 
pre-commit run isort -a
git commit -a -m 'force_grid_wrap=1' --no-verify

I then added an extra commit to update the future-imports check to the new style. No other adjustments were necessary

[simonjayhawkins]

Thanks @MarcoGorelli

This looks like the lesser of the two evils.

[Dr-Irv]

Thanks @MarcoGorelli

This looks like the lesser of the two evils.

I agree. It's a reasonable compromise between readability and merge-ability.

[github-actions]

This pull request is stale because it has been open for thirty days with no activity. Please update and respond to this comment if you're still interested in working on this.

[MarcoGorelli]

closing for now, doesn't look like there was that much support, and maybe merge conflicts don't annoy others as much as they annoy me 😄