[7.x] Sort imports with isort and regenerate APIs

utils/build-dists.py

@@ -20,14 +20,13 @@ Can be used for building both 'elasticsearch' and 'elasticsearchX' dists.
 Only requires 'name' in 'setup.py' and the directory to be changed.
 """
 
-import tempfile
-import os
-import shlex
-import sys
-import re
 import contextlib
+import os
+import re
+import shlex
 import shutil
-
+import sys
+import tempfile
 
 base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 tmp_dir = None

utils/generate-api.py

@@ -16,20 +16,18 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-import os
 import json
+import os
 import re
-import urllib3
-from itertools import chain
 from functools import lru_cache
-
-import black
-from click.testing import CliRunner
+from itertools import chain
 from pathlib import Path
 
-from jinja2 import Environment, FileSystemLoader, TemplateNotFound
+import black
 import unasync
-
+import urllib3
+from click.testing import CliRunner
+from jinja2 import Environment, FileSystemLoader, TemplateNotFound
 
 http = urllib3.PoolManager()
 

utils/license-headers.py

@@ -23,9 +23,8 @@ error out if 'fix' would have changed the file.
 import os
 import re
 import sys
-from typing import List, Iterator
 from itertools import chain
-
+from typing import Iterator, List
 
 lines_to_keep = ["# -*- coding: utf-8 -*-\n", "#!/usr/bin/env python\n"]
 license_header_lines = [