Sync c-core 1.62.0 (#232)

grpc · Feb 21, 2024 · 687be59 · 687be59
1 parent 6104cad
commit 687be59
Show file tree

Hide file tree

Showing 44 changed files with 52 additions and 50 deletions.
diff --git a/native/BUILD b/native/BUILD
@@ -215,7 +215,7 @@ g_stands_for = "guardian"  # @unused
 
 core_version = "39.0.0"  # @unused
 
-version = "1.62.0-pre1"  # @unused
+version = "1.62.0"  # @unused
 
 GPR_PUBLIC_HDRS = [
     "include/grpc/support/alloc.h",

diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt
diff --git a/native/Makefile b/native/Makefile
diff --git a/native/REVISION.txt b/native/REVISION.txt
@@ -1 +1 @@
-ef03a269f597f255d6a052ae062637717a9f4790
+f78a54c5ad4e058734aa9b2beb9459940e4de342
diff --git a/native/_metadata.py b/native/_metadata.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!
 
-__version__ = """1.62.0rc1"""
+__version__ = """1.62.0"""
diff --git a/native/build_handwritten.yaml b/native/build_handwritten.yaml
@@ -16,7 +16,7 @@ settings:
   csharp_major_version: 2
   g_stands_for: guardian
   protobuf_version: 3.25.1
-  version: 1.62.0-pre1
+  version: 1.62.0
 configs:
   asan:
     CC: clang

diff --git a/native/config.m4 b/native/config.m4
diff --git a/native/gRPC-C++.podspec b/native/gRPC-C++.podspec
diff --git a/native/gRPC-Core.podspec b/native/gRPC-Core.podspec
diff --git a/native/gRPC-ProtoRPC.podspec b/native/gRPC-ProtoRPC.podspec
diff --git a/native/gRPC-RxLibrary.podspec b/native/gRPC-RxLibrary.podspec
diff --git a/native/gRPC.podspec b/native/gRPC.podspec
diff --git a/native/include/grpcpp/version_info.h b/native/include/grpcpp/version_info.h
@@ -21,7 +21,7 @@
 #define GRPC_CPP_VERSION_MAJOR 1
 #define GRPC_CPP_VERSION_MINOR 62
 #define GRPC_CPP_VERSION_PATCH 0
-#define GRPC_CPP_VERSION_TAG "pre1"
-#define GRPC_CPP_VERSION_STRING "1.62.0-pre1"
+#define GRPC_CPP_VERSION_TAG ""
+#define GRPC_CPP_VERSION_STRING "1.62.0"
 
 #endif  // GRPCPP_VERSION_INFO_H
diff --git a/native/package.xml b/native/package.xml
diff --git a/native/src/csharp/build/dependencies.props b/native/src/csharp/build/dependencies.props
@@ -1,7 +1,7 @@
 <!-- This file is generated -->
 <Project>
   <PropertyGroup>
-    <GrpcCsharpVersion>2.62.0-pre1</GrpcCsharpVersion>
+    <GrpcCsharpVersion>2.62.0</GrpcCsharpVersion>
     <GoogleProtobufVersion>3.25.1</GoogleProtobufVersion>
   </PropertyGroup>
 </Project>
diff --git a/native/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/native/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler-gRPCCppPlugin'
-  v = '1.62.0-pre1'
+  v = '1.62.0'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates C++ files from .proto services.'
   s.description = <<-DESC

diff --git a/native/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/native/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler-gRPCPlugin'
-  v = '1.62.0-pre1'
+  v = '1.62.0'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
   s.description = <<-DESC

diff --git a/native/src/objective-c/GRPCClient/version.h b/native/src/objective-c/GRPCClient/version.h
@@ -22,4 +22,4 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.
 
-#define GRPC_OBJC_VERSION_STRING @"1.62.0-pre1"
+#define GRPC_OBJC_VERSION_STRING @"1.62.0"
diff --git a/native/src/objective-c/tests/version.h b/native/src/objective-c/tests/version.h
@@ -22,5 +22,5 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.
 
-#define GRPC_OBJC_VERSION_STRING @"1.62.0-pre1"
+#define GRPC_OBJC_VERSION_STRING @"1.62.0"
 #define GRPC_C_VERSION_STRING @"39.0.0"
diff --git a/native/src/php/ext/grpc/version.h b/native/src/php/ext/grpc/version.h
@@ -20,6 +20,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define PHP_GRPC_VERSION "1.62.0RC1"
+#define PHP_GRPC_VERSION "1.62.0"
 
 #endif /* VERSION_H */
diff --git a/native/src/python/grpcio/grpc/_grpcio_metadata.py b/native/src/python/grpcio/grpc/_grpcio_metadata.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!
 
-__version__ = """1.62.0rc1"""
+__version__ = """1.62.0"""
diff --git a/native/src/python/grpcio/grpc_version.py b/native/src/python/grpcio/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
diff --git a/native/src/python/grpcio_admin/grpc_version.py b/native/src/python/grpcio_admin/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_admin/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
diff --git a/native/src/python/grpcio_channelz/grpc_version.py b/native/src/python/grpcio_channelz/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
diff --git a/native/src/python/grpcio_csds/grpc_version.py b/native/src/python/grpcio_csds/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csds/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
diff --git a/native/src/python/grpcio_health_checking/grpc_version.py b/native/src/python/grpcio_health_checking/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
diff --git a/native/src/python/grpcio_observability/README.rst b/native/src/python/grpcio_observability/README.rst
@@ -1,11 +1,12 @@
 gRPC Python Observability
-===========
+=========================
+
 Package for gRPC Python Observability.
 
 More details can be found in `OpenTelemetry Metrics gRFC <https://github.com/grpc/proposal/blob/master/A66-otel-stats.md#opentelemetry-metrics>`_.
 
 How gRPC Python Observability Works
--------------------------
+-----------------------------------
 
 gRPC Python is a wrapper layer built upon the gRPC Core (written in C/C++). Most of telemetry data
 is collected at core layer and then exported to Python layer. To optimize performance and reduce

diff --git a/native/src/python/grpcio_observability/grpc_version.py b/native/src/python/grpcio_observability/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_observability/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
diff --git a/native/src/python/grpcio_observability/setup.py b/native/src/python/grpcio_observability/setup.py
@@ -41,7 +41,7 @@
 _parallel_compile_patch.monkeypatch_compile_maybe()
 
 CLASSIFIERS = [
-    "Private :: Do Not Upload",
+    "Development Status :: 4 - Beta",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: Apache Software License",
@@ -274,6 +274,7 @@ def extension_modules():
     name="grpcio-observability",
     version=grpc_version.VERSION,
     description="gRPC Python observability package",
+    long_description_content_type="text/x-rst",
     long_description=open(README_PATH, "r").read(),
     author="The gRPC Authors",
     author_email="[email protected]",

diff --git a/native/src/python/grpcio_reflection/grpc_version.py b/native/src/python/grpcio_reflection/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
diff --git a/native/src/python/grpcio_status/grpc_version.py b/native/src/python/grpcio_status/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
diff --git a/native/src/python/grpcio_testing/grpc_version.py b/native/src/python/grpcio_testing/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
diff --git a/native/src/python/grpcio_tests/grpc_version.py b/native/src/python/grpcio_tests/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
diff --git a/native/src/ruby/lib/grpc/version.rb b/native/src/ruby/lib/grpc/version.rb
@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.62.0.pre1'
+  VERSION = '1.62.0'
 end
diff --git a/native/src/ruby/nativedebug/version.rb b/native/src/ruby/nativedebug/version.rb
@@ -14,6 +14,6 @@
 
 module GRPC
   module NativeDebug
-    VERSION = '1.62.0.pre1'
+    VERSION = '1.62.0'
   end
 end
diff --git a/native/src/ruby/tools/version.rb b/native/src/ruby/tools/version.rb
@@ -14,6 +14,6 @@
 
 module GRPC
   module Tools
-    VERSION = '1.62.0.pre1'
+    VERSION = '1.62.0'
   end
 end
diff --git a/native/tools/distrib/python/grpc_version.py b/native/tools/distrib/python/grpc_version.py
@@ -14,5 +14,5 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
 PROTOBUF_VERSION = '3.25.1'
diff --git a/native/tools/distrib/python/grpcio_tools/grpc_version.py b/native/tools/distrib/python/grpcio_tools/grpc_version.py
@@ -14,5 +14,5 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
 PROTOBUF_VERSION = '3.25.1'
diff --git a/native/tools/distrib/python/xds_protos/grpc_version.py b/native/tools/distrib/python/xds_protos/grpc_version.py
@@ -14,5 +14,5 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.62.0rc1'
+VERSION = '1.62.0'
 PROTOBUF_VERSION = '3.25.1'
diff --git a/native/tools/doxygen/Doxyfile.c++ b/native/tools/doxygen/Doxyfile.c++
diff --git a/native/tools/doxygen/Doxyfile.c++.internal b/native/tools/doxygen/Doxyfile.c++.internal
diff --git a/native/tools/doxygen/Doxyfile.objc b/native/tools/doxygen/Doxyfile.objc
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Objective-C"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.62.0-pre1
+PROJECT_NUMBER         = 1.62.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/native/tools/doxygen/Doxyfile.objc.internal b/native/tools/doxygen/Doxyfile.objc.internal
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Objective-C"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.62.0-pre1
+PROJECT_NUMBER         = 1.62.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/native/tools/doxygen/Doxyfile.php b/native/tools/doxygen/Doxyfile.php
@@ -40,7 +40,7 @@
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.62.0-pre1
+PROJECT_NUMBER         = 1.62.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ef03a269f597f255d6a052ae062637717a9f4790
		f78a54c5ad4e058734aa9b2beb9459940e4de342
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@

		# AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!

		__version__ = """1.62.0rc1"""
		__version__ = """1.62.0"""