From acd24bcd8dbd3834050f0c70a45c51d4fb619db8 Mon Sep 17 00:00:00 2001
From: zhangskz <89936743+zhangskz@users.noreply.github.com>
Date: Thu, 14 Apr 2022 13:59:40 -0400
Subject: [PATCH] =?UTF-8?q?Add=20disallowment=20of=20setting=20numpy=20sin?=
 =?UTF-8?q?gleton=20arrays=20and=20multi-dimensio=E2=80=A6=20(#9788)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add breaking change (disallow setting numpy singleton arrays and multi-dimensional arrays to fields/repeated fields) and fix to CHANGES.txt, which was missed in a previous git sync.
---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index eb7426954fbcb..ee62ad665c32b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -73,6 +73,8 @@
     JSON serializations with UTF-8 or other non-ASCII encodings.
   * Added experimental support for directly assigning numpy scalars and array.
   * Improve the calculation of public_dependencies in DescriptorPool.
+  * [Breaking Change] Disallow setting fields to numpy singleton arrays or repeated fields to numpy
+    multi-dimensional arrays. Numpy arrays should be indexed or flattened explicitly before assignment.
 
   Compiler
   * Migrate IsDefault(const std::string*) and UnsafeSetDefault(const std::string*)