tox.ini: Add local-macos-python3_pythonorg-python3.9 etc., refactor C…

…ONFIG_CONFIGURE_ARGS_1=...--with-python

tox.ini

@@ -481,22 +481,24 @@ setenv =
     #
     # Setting "--with-system-python3=yes" explicitly in case we change the configure default
     # to "--with-system-python3=force" as originally proposed in #32060
+                          PYTHON_MAJOR=3
+                            PYTHON_MINOR=9
+    python3.7:              PYTHON_MINOR=7
+    python3.8:              PYTHON_MINOR=8
+    python3.9:              PYTHON_MINOR=9
+    python3.10:             PYTHON_MINOR=10
+    python3.11:             PYTHON_MINOR=11
                               CONFIG_CONFIGURE_ARGS_1=--with-system-python3=yes
     python3_spkg:             CONFIG_CONFIGURE_ARGS_1=--without-system-python3
     macos-python3_xcode:      CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/usr/bin/python3
-    macos-{python3_xcode,nohomebrew}-python3.7: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.7/bin/python3
-    macos-{python3_xcode,nohomebrew}-python3.8: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.8/bin/python3
-    # Must manually download and install from https://www.python.org/ftp/python/3.7.7/python-3.7.7-macosx10.9.pkg
-    macos-python3_pythonorg:  CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Frameworks/Python.framework/Versions/3.7/bin/python3
+    macos-{python3_xcode,nohomebrew}-{python3.7,python3.8}:          CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
     # Homebrew keg installs
-    homebrew-python3.7:       CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python={env:HOMEBREW}/opt/python@3.7/bin/python3
-    homebrew-python3.8:       CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python={env:HOMEBREW}/opt/python@3.8/bin/python3
-    homebrew-python3.9:       CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python={env:HOMEBREW}/opt/[email protected]/bin/python3
+    homebrew-{python3.7,python3.8,python3.9,python3.10,python3.11}:  CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python={env:HOMEBREW}/opt/python@{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
+    # Installers from https://www.python.org/downloads/macos/ (must manually download and install)
+    macos-python3_pythonorg:                                         CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Frameworks/Python.framework/Versions/{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
     # https://github.com/pypa/manylinux
-    manylinux-standard:       CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/opt/python/cp38-cp38/bin/python3
+    manylinux-standard:       CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/opt/python/cp{env:PYTHON_MAJOR}{env:PYTHON_MINOR}-cp{env:PYTHON_MAJOR}{env:PYTHON_MINOR}/bin/python3
     manylinux-python3.7:      CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/opt/python/cp37-cp37m/bin/python3
-    manylinux-python3.8:      CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/opt/python/cp38-cp38/bin/python3
-    manylinux-python3.9:      CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/opt/python/cp39-cp39/bin/python3
     conda:                    CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=python3
     #
     #  - toolchain