Merge pull request #5220 from soltanmm/cherries

Truncate Python target triple for custom bdists

build.yaml

@@ -7,7 +7,7 @@ settings:
   '#3': Use "-preN" suffixes to identify pre-release versions
   '#4': Per-language overrides are possible with (eg) ruby_version tag here
   '#5': See the expand_version.py for all the quirks here
-  ruby_version: 0.13.0-pre1.1
+  python_version: 0.13.0-pre2
   version: 0.13.0-pre1
 filegroups:
 - name: census

src/python/grpcio/commands.py

@@ -114,19 +114,17 @@ def _get_grpc_custom_bdist(decorated_basename, target_bdist_basename):
 class WheelNameMixin(object):
   """Mixin for setuptools.Command classes to enable acquiring the bdist name."""
 
-  def wheel_name(self, with_custom):
-    """
-    Args:
-      with_custom: Boolean describing whether or not to decorate the bdist name
-        with custom gRPC-specific target information.
-    """
+  def wheel_custom_name(self):
+    base = self.wheel_name()
+    # Drop troublesome parts of the target tuple
+    base_split = base.split('-')
+    base = '-'.join(base_split[0:3] + base_split[4:])
+    flavor = 'ucs2' if sys.maxunicode == 65535 else 'ucs4'
+    return '{base}-{flavor}'.format(base=base, flavor=flavor)
+
+  def wheel_name(self):
     wheel_command = self.get_finalized_command('bdist_wheel')
-    base = wheel_command.get_archive_basename()
-    if with_custom:
-      flavor = 'ucs2' if sys.maxunicode == 65535 else 'ucs4'
-      return '{base}-{flavor}'.format(base=base, flavor=flavor)
-    else:
-      return base
+    return wheel_command.get_archive_basename()
 
 
 class Install(install.install, WheelNameMixin):
@@ -155,8 +153,8 @@ class Install(install.install, WheelNameMixin):
     if self.use_grpc_custom_bdist:
       try:
         try:
-          bdist_path = _get_grpc_custom_bdist(self.wheel_name(True),
-                                            self.wheel_name(False))
+          bdist_path = _get_grpc_custom_bdist(self.wheel_custom_name(),
+                                              self.wheel_name())
         except CommandError as error:
           sys.stderr.write(
               '\nWARNING: Failed to acquire grpcio prebuilt binary:\n'
@@ -200,7 +198,8 @@ class BdistWheelCustomName(bdist_wheel.bdist_wheel, WheelNameMixin):
     # undocumented, private) ordering of the distribution files.
     bdist_wheel.bdist_wheel.run(self)
     output = self.distribution.dist_files[-1][2]
-    target = os.path.join(self.dist_dir, '{}.whl'.format(self.wheel_name(True)))
+    target = os.path.join(
+        self.dist_dir, '{}.whl'.format(self.wheel_custom_name()))
     shutil.move(output, target)
 
 

src/python/grpcio/grpc_version.py

@@ -29,4 +29,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
 
-VERSION='0.13.0rc1'
+VERSION='0.13.0rc2'

src/ruby/lib/grpc/version.rb

@@ -29,5 +29,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '0.13.0.pre1.1'
+  VERSION = '0.13.0.pre1'
 end