Commit 97723519b1249e8d7e31e5b775f0942ee1d62d40 - grpc

+3

-3

BUILD less more

65	65	# This should be updated along with build.yaml
66	66	g_stands_for = "gloriosa"
67	67
68		core_version = "6.0.0-pre2"
69
70		version = "1.13.0-pre2"
	68	core_version = "6.0.0-pre3"
	69
	70	version = "1.13.0-pre3"
71	71
72	72	GPR_PUBLIC_HDRS = [
73	73	"include/grpc/support/alloc.h",

+1

-1

CMakeLists.txt less more

23	23	cmake_minimum_required(VERSION 2.8)
24	24
25	25	set(PACKAGE_NAME "grpc")
26		set(PACKAGE_VERSION "1.13.0-pre2")
	26	set(PACKAGE_VERSION "1.13.0-pre3")
27	27	set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
28	28	set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
29	29	set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")

+3

-3

Makefile less more

419	419	Q = @
420	420	endif
421	421
422		CORE_VERSION = 6.0.0-pre2
423		CPP_VERSION = 1.13.0-pre2
424		CSHARP_VERSION = 1.13.0-pre2
	422	CORE_VERSION = 6.0.0-pre3
	423	CPP_VERSION = 1.13.0-pre3
	424	CSHARP_VERSION = 1.13.0-pre3
425	425
426	426	CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
427	427	CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

+2

-2

build.yaml less more

11	11	'#08': Use "-preN" suffixes to identify pre-release versions
12	12	'#09': Per-language overrides are possible with (eg) ruby_version tag here
13	13	'#10': See the expand_version.py for all the quirks here
14		core_version: 6.0.0-pre2
	14	core_version: 6.0.0-pre3
15	15	g_stands_for: gloriosa
16		version: 1.13.0-pre2
	16	version: 1.13.0-pre3
17	17	filegroups:
18	18	- name: alts_proto
19	19	headers:

+2

-2

gRPC-C++.podspec less more

22	22	Pod::Spec.new do \|s\|
23	23	s.name = 'gRPC-C++'
24	24	# TODO (mxyan): use version that match gRPC version when pod is stabilized
25		# version = '1.13.0-pre2'
	25	# version = '1.13.0-pre3'
26	26	version = '0.0.2'
27	27	s.version = version
28	28	s.summary = 'gRPC C++ library'

30	30	s.license = 'Apache License, Version 2.0'
31	31	s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' }
32	32
33		grpc_version = '1.13.0-pre2'
	33	grpc_version = '1.13.0-pre3'
34	34
35	35	s.source = {
36	36	:git => 'https://github.com/grpc/grpc.git',

+1

-1

gRPC-Core.podspec less more

21	21
22	22	Pod::Spec.new do \|s\|
23	23	s.name = 'gRPC-Core'
24		version = '1.13.0-pre2'
	24	version = '1.13.0-pre3'
25	25	s.version = version
26	26	s.summary = 'Core cross-platform gRPC library, written in C'
27	27	s.homepage = 'https://grpc.io'

+1

-1

gRPC-ProtoRPC.podspec less more

20	20
21	21	Pod::Spec.new do \|s\|
22	22	s.name = 'gRPC-ProtoRPC'
23		version = '1.13.0-pre2'
	23	version = '1.13.0-pre3'
24	24	s.version = version
25	25	s.summary = 'RPC library for Protocol Buffers, based on gRPC'
26	26	s.homepage = 'https://grpc.io'

+1

-1

gRPC-RxLibrary.podspec less more

20	20
21	21	Pod::Spec.new do \|s\|
22	22	s.name = 'gRPC-RxLibrary'
23		version = '1.13.0-pre2'
	23	version = '1.13.0-pre3'
24	24	s.version = version
25	25	s.summary = 'Reactive Extensions library for iOS/OSX.'
26	26	s.homepage = 'https://grpc.io'

+1

-1

gRPC.podspec less more

19	19
20	20	Pod::Spec.new do \|s\|
21	21	s.name = 'gRPC'
22		version = '1.13.0-pre2'
	22	version = '1.13.0-pre3'
23	23	s.version = version
24	24	s.summary = 'gRPC client library for iOS/OSX'
25	25	s.homepage = 'https://grpc.io'

+2

-2

package.xml less more

12	12	<date>2018-01-19</date>
13	13	<time>16:06:07</time>
14	14	<version>
15		<release>1.13.0RC2</release>
16		<api>1.13.0RC2</api>
	15	<release>1.13.0RC3</release>
	16	<api>1.13.0RC3</api>
17	17	</version>
18	18	<stability>
19	19	<release>beta</release>

+9

-2

src/core/lib/iomgr/exec_ctx.h less more

44	44	/* The exec_ctx's thread is (potentially) owned by a call or channel: care
45	45	should be given to not delete said call/channel from this exec_ctx */
46	46	#define GRPC_EXEC_CTX_FLAG_THREAD_RESOURCE_LOOP 2
	47	/* This exec ctx was initialized by an internal thread, and should not
	48	be counted by fork handlers */
	49	#define GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD 4
47	50
48	51	extern grpc_closure_scheduler* grpc_schedule_on_exec_ctx;
49	52

92	95
93	96	/** Parameterised Constructor */
94	97	ExecCtx(uintptr_t fl) : flags_(fl) {
95		grpc_core::Fork::IncExecCtxCount();
	98	if (!(GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD & flags_)) {
	99	grpc_core::Fork::IncExecCtxCount();
	100	}
96	101	Set(this);
97	102	}
98	103

101	106	flags_ \|= GRPC_EXEC_CTX_FLAG_IS_FINISHED;
102	107	Flush();
103	108	Set(last_exec_ctx_);
104		grpc_core::Fork::DecExecCtxCount();
	109	if (!(GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD & flags_)) {
	110	grpc_core::Fork::DecExecCtxCount();
	111	}
105	112	}
106	113
107	114	/** Disallow copy and assignment operators */

+1

-1

src/core/lib/iomgr/executor.cc less more

144	144	thread_state* ts = static_cast<thread_state*>(arg);
145	145	gpr_tls_set(&g_this_thread_state, (intptr_t)ts);
146	146
147		grpc_core::ExecCtx exec_ctx(0);
	147	grpc_core::ExecCtx exec_ctx(GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD);
148	148
149	149	size_t subtract_depth = 0;
150	150	for (;;) {

+1

-1

src/core/lib/iomgr/timer_manager.cc less more

264	264	static void timer_thread(void* completed_thread_ptr) {
265	265	// this threads exec_ctx: we try to run things through to completion here
266	266	// since it's easy to spin up new threads
267		grpc_core::ExecCtx exec_ctx(0);
	267	grpc_core::ExecCtx exec_ctx(GRPC_EXEC_CTX_FLAG_IS_INTERNAL_THREAD);
268	268	timer_main_loop();
269	269
270	270	timer_thread_cleanup(static_cast<completed_thread*>(completed_thread_ptr));

+1

-1

src/core/lib/surface/version.cc less more

22	22
23	23	#include <grpc/grpc.h>
24	24
25		const char* grpc_version_string(void) { return "6.0.0-pre2"; }
	25	const char* grpc_version_string(void) { return "6.0.0-pre3"; }
26	26
27	27	const char* grpc_g_stands_for(void) { return "gloriosa"; }

+1

-1

src/cpp/common/version_cc.cc less more

21	21	#include <grpcpp/grpcpp.h>
22	22
23	23	namespace grpc {
24		grpc::string Version() { return "1.13.0-pre2"; }
	24	grpc::string Version() { return "1.13.0-pre3"; }
25	25	} // namespace grpc

+1

-1

src/csharp/Grpc.Core/Version.csproj.include less more

0	0	<!-- This file is generated -->
1	1	<Project>
2	2	<PropertyGroup>
3		<GrpcCsharpVersion>1.13.0-pre2</GrpcCsharpVersion>
	3	<GrpcCsharpVersion>1.13.0-pre3</GrpcCsharpVersion>
4	4	<GoogleProtobufVersion>3.5.1</GoogleProtobufVersion>
5	5	</PropertyGroup>
6	6	</Project>

+1

-1

src/csharp/Grpc.Core/VersionInfo.cs less more

37	37	/// <summary>
38	38	/// Current version of gRPC C#
39	39	/// </summary>
40		public const string CurrentVersion = "1.13.0-pre2";
	40	public const string CurrentVersion = "1.13.0-pre3";
41	41	}
42	42	}

+1

-1

src/csharp/build_packages_dotnetcli.bat less more

12	12	@rem limitations under the License.
13	13
14	14	@rem Current package versions
15		set VERSION=1.13.0-pre2
	15	set VERSION=1.13.0-pre3
16	16
17	17	@rem Adjust the location of nuget.exe
18	18	set NUGET=C:\nuget\nuget.exe

+3

-3

src/csharp/build_packages_dotnetcli.sh less more

44	44	dotnet pack --configuration Release Grpc.HealthCheck --output ../../../artifacts
45	45	dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts
46	46
47		nuget pack Grpc.nuspec -Version "1.13.0-pre2" -OutputDirectory ../../artifacts
48		nuget pack Grpc.Core.NativeDebug.nuspec -Version "1.13.0-pre2" -OutputDirectory ../../artifacts
49		nuget pack Grpc.Tools.nuspec -Version "1.13.0-pre2" -OutputDirectory ../../artifacts
	47	nuget pack Grpc.nuspec -Version "1.13.0-pre3" -OutputDirectory ../../artifacts
	48	nuget pack Grpc.Core.NativeDebug.nuspec -Version "1.13.0-pre3" -OutputDirectory ../../artifacts
	49	nuget pack Grpc.Tools.nuspec -Version "1.13.0-pre3" -OutputDirectory ../../artifacts
50	50
51	51	(cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)

+1

-1

src/objective-c/!ProtoCompiler-gRPCPlugin.podspec less more

41	41	# exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
42	42	# before them.
43	43	s.name = '!ProtoCompiler-gRPCPlugin'
44		v = '1.13.0-pre2'
	44	v = '1.13.0-pre3'
45	45	s.version = v
46	46	s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
47	47	s.description = <<-DESC

+1

-1

src/objective-c/GRPCClient/private/version.h less more

21	21	// instead. This file can be regenerated from the template by running
22	22	// `tools/buildgen/generate_projects.sh`.
23	23
24		#define GRPC_OBJC_VERSION_STRING @"1.13.0-pre2"
	24	#define GRPC_OBJC_VERSION_STRING @"1.13.0-pre3"

+2

-2

src/objective-c/tests/version.h less more

21	21	// instead. This file can be regenerated from the template by running
22	22	// `tools/buildgen/generate_projects.sh`.
23	23
24		#define GRPC_OBJC_VERSION_STRING @"1.13.0-pre2"
25		#define GRPC_C_VERSION_STRING @"6.0.0-pre2"
	24	#define GRPC_OBJC_VERSION_STRING @"1.13.0-pre3"
	25	#define GRPC_C_VERSION_STRING @"6.0.0-pre3"

+1

-1

src/php/ext/grpc/version.h less more

19	19	#ifndef VERSION_H
20	20	#define VERSION_H
21	21
22		#define PHP_GRPC_VERSION "1.13.0RC2"
	22	#define PHP_GRPC_VERSION "1.13.0RC3"
23	23
24	24	#endif /* VERSION_H */

+44

-32

src/php/lib/Grpc/BaseStub.php less more

231	231	*
232	232	* @return \Closure
233	233	*/
234		private function _GrpcUnaryUnary($channel, $deserialize)
	234	private function _GrpcUnaryUnary($channel)
235	235	{
236	236	return function ($method,
237	237	$argument,
	238	$deserialize,
238	239	array $metadata = [],
239		array $options = []) use ($channel, $deserialize) {
	240	array $options = []) use ($channel) {
240	241	$call = new UnaryCall(
241	242	$channel,
242	243	$method,

267	268	*
268	269	* @return \Closure
269	270	*/
270		private function _GrpcStreamUnary($channel, $deserialize)
	271	private function _GrpcStreamUnary($channel)
271	272	{
272	273	return function ($method,
	274	$deserialize,
273	275	array $metadata = [],
274		array $options = []) use ($channel, $deserialize) {
	276	array $options = []) use ($channel) {
275	277	$call = new ClientStreamingCall(
276	278	$channel,
277	279	$method,

302	304	*
303	305	* @return \Closure
304	306	*/
305		private function _GrpcUnaryStream($channel, $deserialize)
	307	private function _GrpcUnaryStream($channel)
306	308	{
307	309	return function ($method,
308	310	$argument,
	311	$deserialize,
309	312	array $metadata = [],
310		array $options = []) use ($channel, $deserialize) {
	313	array $options = []) use ($channel) {
311	314	$call = new ServerStreamingCall(
312	315	$channel,
313	316	$method,

338	341	*
339	342	* @return \Closure
340	343	*/
341		private function _GrpcStreamStream($channel, $deserialize)
	344	private function _GrpcStreamStream($channel)
342	345	{
343	346	return function ($method,
	347	$deserialize,
344	348	array $metadata = [],
345		array $options = []) use ($channel ,$deserialize) {
	349	array $options = []) use ($channel) {
346	350	$call = new BidiStreamingCall(
347	351	$channel,
348	352	$method,

374	378	*
375	379	* @return \Closure
376	380	*/
377		private function _UnaryUnaryCallFactory($channel, $deserialize)
	381	private function _UnaryUnaryCallFactory($channel)
378	382	{
379	383	if (is_a($channel, 'Grpc\Internal\InterceptorChannel')) {
380	384	return function ($method,
381	385	$argument,
	386	$deserialize,
382	387	array $metadata = [],
383		array $options = []) use ($channel, $deserialize) {
	388	array $options = []) use ($channel) {
384	389	return $channel->getInterceptor()->interceptUnaryUnary(
385	390	$method,
386	391	$argument,
	392	$deserialize,
387	393	$metadata,
388	394	$options,
389		$this->_UnaryUnaryCallFactory($channel->getNext(), $deserialize)
	395	$this->_UnaryUnaryCallFactory($channel->getNext())
390	396	);
391	397	};
392	398	}
393		return $this->_GrpcUnaryUnary($channel, $deserialize);
	399	return $this->_GrpcUnaryUnary($channel);
394	400	}
395	401
396	402	/**

401	407	*
402	408	* @return \Closure
403	409	*/
404		private function _UnaryStreamCallFactory($channel, $deserialize)
	410	private function _UnaryStreamCallFactory($channel)
405	411	{
406	412	if (is_a($channel, 'Grpc\Internal\InterceptorChannel')) {
407	413	return function ($method,
408	414	$argument,
	415	$deserialize,
409	416	array $metadata = [],
410		array $options = []) use ($channel, $deserialize) {
	417	array $options = []) use ($channel) {
411	418	return $channel->getInterceptor()->interceptUnaryStream(
412	419	$method,
413	420	$argument,
	421	$deserialize,
414	422	$metadata,
415	423	$options,
416		$this->_UnaryStreamCallFactory($channel->getNext(), $deserialize)
	424	$this->_UnaryStreamCallFactory($channel->getNext())
417	425	);
418	426	};
419	427	}
420		return $this->_GrpcUnaryStream($channel, $deserialize);
	428	return $this->_GrpcUnaryStream($channel);
421	429	}
422	430
423	431	/**

428	436	*
429	437	* @return \Closure
430	438	*/
431		private function _StreamUnaryCallFactory($channel, $deserialize)
	439	private function _StreamUnaryCallFactory($channel)
432	440	{
433	441	if (is_a($channel, 'Grpc\Internal\InterceptorChannel')) {
434	442	return function ($method,
	443	$deserialize,
435	444	array $metadata = [],
436		array $options = []) use ($channel, $deserialize) {
	445	array $options = []) use ($channel) {
437	446	return $channel->getInterceptor()->interceptStreamUnary(
438	447	$method,
	448	$deserialize,
439	449	$metadata,
440	450	$options,
441		$this->_StreamUnaryCallFactory($channel->getNext(), $deserialize)
	451	$this->_StreamUnaryCallFactory($channel->getNext())
442	452	);
443	453	};
444	454	}
445		return $this->_GrpcStreamUnary($channel, $deserialize);
	455	return $this->_GrpcStreamUnary($channel);
446	456	}
447	457
448	458	/**

453	463	*
454	464	* @return \Closure
455	465	*/
456		private function _StreamStreamCallFactory($channel, $deserialize)
	466	private function _StreamStreamCallFactory($channel)
457	467	{
458	468	if (is_a($channel, 'Grpc\Internal\InterceptorChannel')) {
459	469	return function ($method,
	470	$deserialize,
460	471	array $metadata = [],
461		array $options = []) use ($channel, $deserialize) {
	472	array $options = []) use ($channel) {
462	473	return $channel->getInterceptor()->interceptStreamStream(
463	474	$method,
	475	$deserialize,
464	476	$metadata,
465	477	$options,
466		$this->_StreamStreamCallFactory($channel->getNext(), $deserialize)
	478	$this->_StreamStreamCallFactory($channel->getNext())
467	479	);
468	480	};
469	481	}
470		return $this->_GrpcStreamStream($channel, $deserialize);
	482	return $this->_GrpcStreamStream($channel);
471	483	}
472	484
473	485	/* This class is intended to be subclassed by generated code, so

492	504	array $metadata = [],
493	505	array $options = []
494	506	) {
495		$call_factory = $this->_UnaryUnaryCallFactory($this->channel, $deserialize);
496		$call = $call_factory($method, $argument, $metadata, $options);
	507	$call_factory = $this->_UnaryUnaryCallFactory($this->channel);
	508	$call = $call_factory($method, $argument, $deserialize, $metadata, $options);
497	509	return $call;
498	510	}
499	511

515	527	array $metadata = [],
516	528	array $options = []
517	529	) {
518		$call_factory = $this->_StreamUnaryCallFactory($this->channel, $deserialize);
519		$call = $call_factory($method, $metadata, $options);
	530	$call_factory = $this->_StreamUnaryCallFactory($this->channel);
	531	$call = $call_factory($method, $deserialize, $metadata, $options);
520	532	return $call;
521	533	}
522	534

540	552	array $metadata = [],
541	553	array $options = []
542	554	) {
543		$call_factory = $this->_UnaryStreamCallFactory($this->channel, $deserialize);
544		$call = $call_factory($method, $argument, $metadata, $options);
	555	$call_factory = $this->_UnaryStreamCallFactory($this->channel);
	556	$call = $call_factory($method, $argument, $deserialize, $metadata, $options);
545	557	return $call;
546	558	}
547	559

562	574	array $metadata = [],
563	575	array $options = []
564	576	) {
565		$call_factory = $this->_StreamStreamCallFactory($this->channel, $deserialize);
566		$call = $call_factory($method, $metadata, $options);
	577	$call_factory = $this->_StreamStreamCallFactory($this->channel);
	578	$call = $call_factory($method, $deserialize, $metadata, $options);
567	579	return $call;
568	580	}
569	581	}

+10

-4

src/php/lib/Grpc/Interceptor.php less more

20	20
21	21	/**
22	22	* Represents an interceptor that intercept RPC invocations before call starts.
	23	* There is one proposal related to the argument $deserialize under the review.
	24	* The proposal link is https://github.com/grpc/proposal/pull/86.
23	25	* This is an EXPERIMENTAL API.
24	26	*/
25	27	class Interceptor

27	29	public function interceptUnaryUnary(
28	30	$method,
29	31	$argument,
	32	$deserialize,
30	33	array $metadata = [],
31	34	array $options = [],
32	35	$continuation
33	36	) {
34		return $continuation($method, $argument, $metadata, $options);
	37	return $continuation($method, $argument, $deserialize, $metadata, $options);
35	38	}
36	39
37	40	public function interceptStreamUnary(
38	41	$method,
	42	$deserialize,
39	43	array $metadata = [],
40	44	array $options = [],
41	45	$continuation
42	46	) {
43		return $continuation($method, $metadata, $options);
	47	return $continuation($method, $deserialize, $metadata, $options);
44	48	}
45	49
46	50	public function interceptUnaryStream(
47	51	$method,
48	52	$argument,
	53	$deserialize,
49	54	array $metadata = [],
50	55	array $options = [],
51	56	$continuation
52	57	) {
53		return $continuation($method, $argument, $metadata, $options);
	58	return $continuation($method, $argument, $deserialize, $metadata, $options);
54	59	}
55	60
56	61	public function interceptStreamStream(
57	62	$method,
	63	$deserialize,
58	64	array $metadata = [],
59	65	array $options = [],
60	66	$continuation
61	67	) {
62		return $continuation($method, $metadata, $options);
	68	return $continuation($method, $deserialize, $metadata, $options);
63	69	}
64	70
65	71	/**

+14

-10

src/php/tests/unit_tests/InterceptorTest.php less more

93	93	{
94	94	public function interceptUnaryUnary($method,
95	95	$argument,
	96	$deserialize,
96	97	array $metadata = [],
97	98	array $options = [],
98	99	$continuation)
99	100	{
100	101	$metadata["foo"] = array('interceptor_from_unary_request');
101		return $continuation($method, $argument, $metadata, $options);
102		}
103		public function interceptStreamUnary($method, array $metadata = [], array $options = [], $continuation)
	102	return $continuation($method, $argument, $deserialize, $metadata, $options);
	103	}
	104	public function interceptStreamUnary($method, $deserialize, array $metadata = [], array $options = [], $continuation)
104	105	{
105	106	$metadata["foo"] = array('interceptor_from_stream_request');
106		return $continuation($method, $metadata, $options);
	107	return $continuation($method, $deserialize, $metadata, $options);
107	108	}
108	109	}
109	110

111	112	{
112	113	public function interceptUnaryUnary($method,
113	114	$argument,
	115	$deserialize,
114	116	array $metadata = [],
115	117	array $options = [],
116	118	$continuation)

120	122	} else {
121	123	$metadata["bar"] = array('interceptor_from_unary_request');
122	124	}
123		return $continuation($method, $argument, $metadata, $options);
	125	return $continuation($method, $argument, $deserialize, $metadata, $options);
124	126	}
125	127	public function interceptStreamUnary($method,
	128	$deserialize,
126	129	array $metadata = [],
127	130	array $options = [],
128	131	$continuation)

132	135	} else {
133	136	$metadata["bar"] = array('interceptor_from_stream_request');
134	137	}
135		return $continuation($method, $metadata, $options);
	138	return $continuation($method, $deserialize, $metadata, $options);
136	139	}
137	140	}
138	141

165	168	{
166	169	public function interceptUnaryUnary($method,
167	170	$argument,
	171	$deserialize,
168	172	array $metadata = [],
169	173	array $options = [],
170	174	$continuation)
171	175	{
172	176	$argument->setData('intercepted_unary_request');
173		return $continuation($method, $argument, $metadata, $options);
174		}
175		public function interceptStreamUnary($method, array $metadata = [], array $options = [], $continuation)
	177	return $continuation($method, $argument, $deserialize, $metadata, $options);
	178	}
	179	public function interceptStreamUnary($method, $deserialize, array $metadata = [], array $options = [], $continuation)
176	180	{
177	181	return new ChangeRequestCall(
178		$continuation($method, $metadata, $options)
	182	$continuation($method, $deserialize, $metadata, $options)
179	183	);
180	184	}
181	185	}

+1

-1

src/python/grpcio/grpc/_grpcio_metadata.py less more

13	13
14	14	# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!
15	15
16		__version__ = """1.13.0rc2"""
	16	__version__ = """1.13.0rc3"""

+1

-1

src/python/grpcio/grpc_version.py less more

13	13
14	14	# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
15	15
16		VERSION = '1.13.0rc2'
	16	VERSION = '1.13.0rc3'

+1

-1

src/python/grpcio_health_checking/grpc_version.py less more

13	13
14	14	# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
15	15
16		VERSION = '1.13.0rc2'
	16	VERSION = '1.13.0rc3'

+1

-1

src/python/grpcio_reflection/grpc_version.py less more

13	13
14	14	# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
15	15
16		VERSION = '1.13.0rc2'
	16	VERSION = '1.13.0rc3'

+3

-0

src/python/grpcio_testing/MANIFEST.in less more

	0	include grpc_version.py
	1	recursive-include grpc_testing *.py
	2	global-exclude *.pyc

+10

-0

src/python/grpcio_testing/README.rst less more

	0	gRPC Python Testing Package
	1	===========================
	2
	3	Testing utilities for gRPC Python
	4
	5	Dependencies
	6	------------
	7
	8	Depends on the `grpcio` package, available from PyPI via `pip install grpcio`.
	9

+1

-1

src/python/grpcio_testing/grpc_version.py less more

13	13
14	14	# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!!
15	15
16		VERSION = '1.13.0rc2'
	16	VERSION = '1.13.0rc3'

+1

-1

src/python/grpcio_tests/grpc_version.py less more

13	13
14	14	# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
15	15
16		VERSION = '1.13.0rc2'
	16	VERSION = '1.13.0rc3'

+1

-1

src/ruby/lib/grpc/version.rb less more

13	13
14	14	# GRPC contains the General RPC module.
15	15	module GRPC
16		VERSION = '1.13.0.pre2'
	16	VERSION = '1.13.0.pre3'
17	17	end

+1

-1

src/ruby/tools/version.rb less more

13	13
14	14	module GRPC
15	15	module Tools
16		VERSION = '1.13.0.pre2'
	16	VERSION = '1.13.0.pre3'
17	17	end
18	18	end

+7

-9

test/distrib/python/test_packages.sh less more

27	27	echo "Testing Python source distribution"
28	28	ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-[0-9]*.tar.gz)
29	29	TOOLS_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-tools-[0-9]*.tar.gz)
30		HEALTH_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-health-checking-[0-9]*.tar.gz)
31		REFLECTION_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-reflection-[0-9]*.tar.gz)
32	30	fi
	31
	32	HEALTH_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-health-checking-[0-9]*.tar.gz)
	33	REFLECTION_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-reflection-[0-9]*.tar.gz)
	34	TESTING_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-testing-[0-9]*.tar.gz)
33	35
34	36	VIRTUAL_ENV=$(mktemp -d)
35	37	virtualenv "$VIRTUAL_ENV"

52	54
53	55	at_least_one_installs "${ARCHIVES[@]}"
54	56	at_least_one_installs "${TOOLS_ARCHIVES[@]}"
55
56		if [[ "$1" == "source" ]]
57		then
58		echo "Testing Python health and reflection packages"
59		at_least_one_installs "${HEALTH_ARCHIVES[@]}"
60		at_least_one_installs "${REFLECTION_ARCHIVES[@]}"
61		fi
	57	at_least_one_installs "${HEALTH_ARCHIVES[@]}"
	58	at_least_one_installs "${REFLECTION_ARCHIVES[@]}"
	59	at_least_one_installs "${TESTING_ARCHIVES[@]}"
62	60
63	61
64	62	#

+1

-1

tools/distrib/python/grpcio_tools/grpc_version.py less more

13	13
14	14	# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
15	15
16		VERSION = '1.13.0rc2'
	16	VERSION = '1.13.0rc3'

+1

-1

tools/doxygen/Doxyfile.c++ less more

39	39	# could be handy for archiving the generated documentation or if some version
40	40	# control system is used.
41	41
42		PROJECT_NUMBER = 1.13.0-pre2
	42	PROJECT_NUMBER = 1.13.0-pre3
43	43
44	44	# Using the PROJECT_BRIEF tag one can provide an optional one line description
45	45	# for a project that appears at the top of each page and should give viewer a

+1

-1

tools/doxygen/Doxyfile.c++.internal less more

39	39	# could be handy for archiving the generated documentation or if some version
40	40	# control system is used.
41	41
42		PROJECT_NUMBER = 1.13.0-pre2
	42	PROJECT_NUMBER = 1.13.0-pre3
43	43
44	44	# Using the PROJECT_BRIEF tag one can provide an optional one line description
45	45	# for a project that appears at the top of each page and should give viewer a

+1

-1

tools/doxygen/Doxyfile.core less more

39	39	# could be handy for archiving the generated documentation or if some version
40	40	# control system is used.
41	41
42		PROJECT_NUMBER = 6.0.0-pre2
	42	PROJECT_NUMBER = 6.0.0-pre3
43	43
44	44	# Using the PROJECT_BRIEF tag one can provide an optional one line description
45	45	# for a project that appears at the top of each page and should give viewer a

+1

-1

tools/doxygen/Doxyfile.core.internal less more

39	39	# could be handy for archiving the generated documentation or if some version
40	40	# control system is used.
41	41
42		PROJECT_NUMBER = 6.0.0-pre2
	42	PROJECT_NUMBER = 6.0.0-pre3
43	43
44	44	# Using the PROJECT_BRIEF tag one can provide an optional one line description
45	45	# for a project that appears at the top of each page and should give viewer a

+6

-2

tools/run_tests/artifacts/build_artifact_python.sh less more

98	98	"${PIP}" install grpcio --no-index --find-links "file://$ARTIFACT_DIR/"
99	99	"${PIP}" install grpcio-tools --no-index --find-links "file://$ARTIFACT_DIR/"
100	100
101		# Build gRPC health-checking source distribution
	101	# Build grpcio_testing source distribution
	102	${SETARCH_CMD} "${PYTHON}" src/python/grpcio_testing/setup.py sdist
	103	cp -r src/python/grpcio_testing/dist/* "$ARTIFACT_DIR"
	104
	105	# Build grpcio_health_checking source distribution
102	106	${SETARCH_CMD} "${PYTHON}" src/python/grpcio_health_checking/setup.py \
103	107	preprocess build_package_protos sdist
104	108	cp -r src/python/grpcio_health_checking/dist/* "$ARTIFACT_DIR"
105	109
106		# Build gRPC reflection source distribution
	110	# Build grpcio_reflection source distribution
107	111	${SETARCH_CMD} "${PYTHON}" src/python/grpcio_reflection/setup.py \
108	112	preprocess build_package_protos sdist
109	113	cp -r src/python/grpcio_reflection/dist/* "$ARTIFACT_DIR"