Making order of options more consistent in docs and BuildOptions fields

cibuildwheel/__main__.py

@@ -115,9 +115,10 @@ def main() -> None:
             exit(2)
 
     output_dir = args.output_dir
-    test_command = get_option_from_environment('CIBW_TEST_COMMAND', platform=platform)
     test_requires = get_option_from_environment('CIBW_TEST_REQUIRES', platform=platform, default='').split()
     test_extras = get_option_from_environment('CIBW_TEST_EXTRAS', platform=platform, default='')
+    before_test = get_option_from_environment('CIBW_BEFORE_TEST', platform=platform, default='')
+    test_command = get_option_from_environment('CIBW_TEST_COMMAND', platform=platform)
     package_dir = args.package_dir
     before_build = get_option_from_environment('CIBW_BEFORE_BUILD', platform=platform)
     build_verbosity_str = get_option_from_environment('CIBW_BUILD_VERBOSITY', platform=platform, default='')
@@ -130,7 +131,6 @@ def main() -> None:
         repair_command_default = ''
     repair_command = get_option_from_environment('CIBW_REPAIR_WHEEL_COMMAND', platform=platform, default=repair_command_default)
     environment_config = get_option_from_environment('CIBW_ENVIRONMENT', platform=platform, default='')
-    before_test = get_option_from_environment('CIBW_BEFORE_TEST', platform=platform, default='')
 
     dependency_versions = get_option_from_environment('CIBW_DEPENDENCY_VERSIONS', platform=platform, default='pinned')
     if dependency_versions == 'pinned':

cibuildwheel/util.py

@@ -110,17 +110,17 @@ class DependencyConstraints:
 class BuildOptions(NamedTuple):
     package_dir: str
     output_dir: str
-    test_command: Optional[str]
+    build_selector: BuildSelector
+    environment: ParsedEnvironment
+    before_build: Optional[str]
+    repair_command: str
+    manylinux_images: Optional[Dict[str, str]]
+    dependency_constraints: Optional[DependencyConstraints]
+    before_test: str
     test_requires: List[str]
     test_extras: str
-    before_build: Optional[str]
+    test_command: Optional[str]
     build_verbosity: int
-    build_selector: BuildSelector
-    repair_command: str
-    environment: ParsedEnvironment
-    before_test: str
-    dependency_constraints: Optional[DependencyConstraints]
-    manylinux_images: Optional[Dict[str, str]]
 
 
 resources_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), 'resources'))