Merge remote-tracking branch 'origin/master' into macos-universal2

# Conflicts:
#	bin/sample_build.py
#	cibuildwheel/__main__.py
#	cibuildwheel/macos.py
#	cibuildwheel/util.py
#	cibuildwheel/windows.py

setup.cfg

@@ -1,7 +1,7 @@
 [metadata]
 
 name = cibuildwheel
-version = 1.7.4
+version = 1.8.0
 description = Build Python wheels on CI with minimal configuration.
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -31,6 +31,7 @@ install_requires =
     bashlex!=0.13
     toml
     certifi
+    bracex
     typing_extensions; python_version < '3.8'
 
 [options.package_data]
@@ -50,6 +51,8 @@ dev =
     pyyaml
     requests
     typing-extensions
+    packaging>=20.8
+    rich>=9.6
 
 [options.packages.find]
 include =
@@ -80,7 +83,7 @@ junit_family=xunit2
 
 [mypy]
 python_version = 3.6
-files = cibuildwheel,test,unit_test
+files = cibuildwheel,test,unit_test,bin
 warn_unused_configs = True
 warn_redundant_casts = True
 
@@ -112,6 +115,13 @@ ignore_missing_imports = True
 [mypy-bashlex.*]
 ignore_missing_imports = True
 
+# Has type stubs, but no pyproject.toml or .pyi files in the wheel.
+[mypy-toml.*]
+ignore_missing_imports = True
+
+[mypy-bracex.*]
+ignore_missing_imports = True
+
 [tool:isort]
 profile=black
 multi_line_output=3