scripts/dts: Fix for PyYAML 5.1 Loader changes

PyYAML 5.1 was just released and it doesn't support !include as
previous versions do.  This breaks our DTS bindings parsing.

Let's fix our extract_dts_include.py script to work with both
3.13 and 5.1.

Also, update the pyyaml requirement to >=3.13 to be sure we're
compatible.

Fixes: #14496

Signed-off-by: Michael Scott <[email protected]>

Author: mike-scott

scripts/dts/extract_dts_includes.py

@@ -338,7 +338,7 @@ def load_bindings(root, binding_dirs):
     compats = []
 
     # Add '!include foo.yaml' handling
-    yaml.add_constructor('!include', yaml_include)
+    yaml.Loader.add_constructor('!include', yaml_include)
 
     loaded_yamls = set()
 
@@ -367,7 +367,8 @@ def load_bindings(root, binding_dirs):
             compats.append(compat)
 
         with open(file, 'r', encoding='utf-8') as yf:
-            binding = merge_included_bindings(file, yaml.load(yf))
+            binding = merge_included_bindings(file,
+                                              yaml.load(yf, Loader=yaml.Loader))
 
             if 'parent' in binding:
                 bus_to_binding[binding['parent']['bus']][compat] = binding
@@ -429,7 +430,7 @@ def load_binding_file(fname):
                        "!include statement: {}".format(fname, filepaths))
 
     with open(filepaths[0], 'r', encoding='utf-8') as f:
-        return yaml.load(f)
+        return yaml.load(f, Loader=yaml.Loader)
 
 
 def yaml_inc_error(msg):

scripts/requirements.txt

@@ -5,7 +5,7 @@ docutils==0.14
 sphinx_rtd_theme
 sphinxcontrib-svg2pdfconverter
 junit2html
-PyYAML>=3.12
+PyYAML>=3.13
 ply==3.10
 hub==2.0
 gitlint