Merge remote-tracking branch 'origin/master' into deterministic-builds

docs/cpp_standards.md

@@ -20,7 +20,7 @@ OS X/macOS allows you to specify a so-called "deployment target" version that wi
 
 However, to enable modern C++ standards, the deploment target needs to be set high enough (since older OS X/macOS versions did not have the necessary modern C++ standard library).
 
-To get C++11 and C++14 support, set `MACOSX_DEPLOYMENT_TARGET` to (at least) `"10.9"`.
+To get C++11 and C++14 support, `MACOSX_DEPLOYMENT_TARGET` needs to be set to (at least) `"10.9"`. By default, `cibuildwheel` already does this, building 64-bit-only wheels for macOS 10.9 and later.
 
 To get C++17 support, set `MACOSX_DEPLOYMENT_TARGET` to (at least) `"10.13"` or `"10.14"` (macOS 10.13 offers partial C++17 support; e.g., the filesystem header is in experimental, offering `#include <experimental/filesystem>` instead of `#include <filesystem>`; macOS 10.14 has full C++17 support).
 

docs/mkdocs_include_markdown_plugin/mkdocs_include_markdown_plugin/plugin.py

@@ -1,4 +1,9 @@
-import mkdocs, re, os, io, cgi
+import cgi
+import io
+import os
+import re
+
+import mkdocs
 
 INCLUDE_TAG_REGEX = re.compile(
     r'''
@@ -28,6 +33,7 @@ INCLUDEMARKDOWN_TAG_REGEX = re.compile(
     flags=re.VERBOSE,
 )
 
+
 class ImportMarkdownPlugin(mkdocs.plugins.BasePlugin):
     def on_page_markdown(self, markdown, page, **kwargs):
         page_src_path = page.file.abs_src_path
@@ -49,7 +55,6 @@ class ImportMarkdownPlugin(mkdocs.plugins.BasePlugin):
 
             return text_to_include
 
-
         def found_includemarkdown_tag(match):
             filename = match.group('filename')
             start = match.group('start')
@@ -62,13 +67,13 @@ class ImportMarkdownPlugin(mkdocs.plugins.BasePlugin):
 
             with io.open(file_path_abs, encoding='utf8') as f:
                 text_to_include = f.read()
-            
+
             if start:
                 _, _, text_to_include = text_to_include.partition(start)
 
             if end:
                 text_to_include, _, _ = text_to_include.partition(end)
-            
+
             return (
                 '<!-- BEGIN INCLUDE %s %s %s -->\n' % (
                     filename, cgi.escape(start or ''), cgi.escape(end or '')
@@ -80,4 +85,3 @@ class ImportMarkdownPlugin(mkdocs.plugins.BasePlugin):
         markdown = re.sub(INCLUDE_TAG_REGEX, found_include_tag, markdown)
         markdown = re.sub(INCLUDEMARKDOWN_TAG_REGEX, found_includemarkdown_tag, markdown)
         return markdown
-