Review comments

pull/24911/head
Richard Belleville 4 years ago
parent 010d62175e
commit 38124ab0c6
  1. 2
      templates/grpc.gemspec.template
  2. 2
      tools/buildgen/plugins/expand_version.py
  3. 2
      tools/distrib/python/grpcio_tools/setup.py

@ -34,7 +34,7 @@
s.require_paths = %w( src/ruby/lib src/ruby/bin src/ruby/pb )
s.platform = Gem::Platform::RUBY
s.add_dependency 'google-protobuf', '~> ${settings.protobuf_short_version}'
s.add_dependency 'google-protobuf', '~> ${settings.protobuf_major_minor_version}'
s.add_dependency 'googleapis-common-protos-types', '~> 1.0'
s.add_development_dependency 'bundler', '>= 1.9'

@ -127,5 +127,5 @@ def mako_plugin(dictionary):
else:
settings[version_tag] = Version(version_str,
override_major=override_major)
settings['protobuf_short_version'] = (
settings['protobuf_major_minor_version'] = (
'.'.join(settings['protobuf_version'].split('.')[:-1]))

@ -230,7 +230,7 @@ setuptools.setup(
ext_modules=extension_modules(),
packages=setuptools.find_packages('.'),
install_requires=[
'protobuf=={}'.format(grpc_version.PROTOBUF_VERSION),
'protobuf>=3.5.0.post1, < 4.0dev',
'grpcio>={version}'.format(version=grpc_version.VERSION),
'setuptools',
],

Loading…
Cancel
Save