Merge tag '6.0' into HEAD

Bug: 86678

Change-Id: Ief079a765fc72fb108c51d4ca182105dac16d776

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
new file mode 100644
index 0000000..c7e5ef6
--- /dev/null
+++ b/BUILD.gn
@@ -0,0 +1,28 @@
+# Copyright 2021 The Fuchsia Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/python/python_library.gni")
+
+python_library("yaml") {
+  source_root = "lib3/yaml"
+  sources = [
+    "__init__.py",
+    "composer.py",
+    "constructor.py",
+    "cyaml.py",
+    "dumper.py",
+    "emitter.py",
+    "error.py",
+    "events.py",
+    "loader.py",
+    "nodes.py",
+    "parser.py",
+    "reader.py",
+    "representer.py",
+    "resolver.py",
+    "scanner.py",
+    "serializer.py",
+    "tokens.py",
+  ]
+}

OWNERS

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..3db17d3
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,7 @@
+chandarren@google.com
+chaselatta@google.com
+jasoncampbell@google.com
+naudzghebre@google.com
+dworsham@google.com
+
+# COMPONENT: FlutteronFuchsia

README.fuchsia

diff --git a/README.fuchsia b/README.fuchsia
new file mode 100644
index 0000000..38ec22c
--- /dev/null
+++ b/README.fuchsia
@@ -0,0 +1,13 @@
+Name: PyYAML
+License: MIT
+License File: LICENSE
+Upstream Git: https://github.com/yaml/pyyaml
+URL: http://pyyaml.org/
+Description:
+
+YAML (Yet Another Markup Language) parser and emitter for Python.
+
+Local Modifications:
+Added README.fuchsia.
+Added py_srcs.gni.
+Added BUILD.gn.

py_srcs.gni

diff --git a/py_srcs.gni b/py_srcs.gni
new file mode 100644
index 0000000..f7c99d3
--- /dev/null
+++ b/py_srcs.gni
@@ -0,0 +1,22 @@
+# Scripts import yaml from third_party should have these sources added to their
+# `inputs` variable of their corresponding actions. This makes changes in this
+# library correctly trigger rebuilds of those actions in incremental builds.
+third_party_yaml_lib3_srcs = [
+  "//third_party/pyyaml/lib3/yaml/__init__.py",
+  "//third_party/pyyaml/lib3/yaml/composer.py",
+  "//third_party/pyyaml/lib3/yaml/constructor.py",
+  "//third_party/pyyaml/lib3/yaml/cyaml.py",
+  "//third_party/pyyaml/lib3/yaml/dumper.py",
+  "//third_party/pyyaml/lib3/yaml/emitter.py",
+  "//third_party/pyyaml/lib3/yaml/error.py",
+  "//third_party/pyyaml/lib3/yaml/events.py",
+  "//third_party/pyyaml/lib3/yaml/loader.py",
+  "//third_party/pyyaml/lib3/yaml/nodes.py",
+  "//third_party/pyyaml/lib3/yaml/parser.py",
+  "//third_party/pyyaml/lib3/yaml/reader.py",
+  "//third_party/pyyaml/lib3/yaml/representer.py",
+  "//third_party/pyyaml/lib3/yaml/resolver.py",
+  "//third_party/pyyaml/lib3/yaml/scanner.py",
+  "//third_party/pyyaml/lib3/yaml/serializer.py",
+  "//third_party/pyyaml/lib3/yaml/tokens.py",
+]