[impala] branch master updated: IMPALA-10937: Fix broken-build on Centos-7

[wz...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git


The following commit(s) were added to refs/heads/master by this push:
     new 1a61a80  IMPALA-10937: Fix broken-build on Centos-7
1a61a80 is described below

commit 1a61a8025c87c37921a1bba4c49f754d8bd10bcc
Author: wzhou-code <wz...@cloudera.com>
AuthorDate: Tue Sep 28 23:51:49 2021 -0700

    IMPALA-10937: Fix broken-build on Centos-7
    
    A recent patch upgraded thrift_sasl from 0.4.2 to 0.4.3. It broke
    the builds on Centos-7.
    The version of setuptools which is installed by Jenkins for the
    virtualenvs on Centos 7 could be lower than the requirement by
    thrift_sasl 0.4.3. Another issue is the new string syntax for
    install_requires in setup.py is not accepted on Centos-7.
    This patch remove the requirement for setuptools in setup.py of
    thrift_sasl as work around. Also change back the syntax of strings
    for install_requires.
    
    Testing:
      - Ran core test on impala-private-parameterized which use Centos-7.
      - Ran core test on pre-review-test which use Ubuntu.
    
    Change-Id: I2c256a8ec9a151bca8b3370bfce6ecebf060bad0
    Reviewed-on: http://gerrit.cloudera.org:8080/17886
    Reviewed-by: Joe McDonnell <jo...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 shell/ext-py/thrift_sasl-0.4.3/setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/ext-py/thrift_sasl-0.4.3/setup.py b/shell/ext-py/thrift_sasl-0.4.3/setup.py
index 6d3ff77..a55add0 100644
--- a/shell/ext-py/thrift_sasl-0.4.3/setup.py
+++ b/shell/ext-py/thrift_sasl-0.4.3/setup.py
@@ -14,8 +14,10 @@
 
 from __future__ import absolute_import
 
+import sys
 from setuptools import setup
 
+PY3 = sys.version_info[0] == 3
 
 description = ("Thrift SASL Python module that implements SASL transports for "
                "Thrift (`TSaslClientTransport`).")
@@ -26,11 +28,9 @@ setup(
     description=description,
     long_description=description,
     url='https://github.com/cloudera/thrift_sasl',
-    setup_requires=['setuptools>=20.5'],
     install_requires=[
         # Python 3 support was added to thrift in version 0.10.0.
-        "thrift>=0.10.0;python_version>='3.0'",
-        "thrift>=0.9.3;python_version<'3.0'",
+        "thrift>=0.10.0" if PY3 else "thrift>=0.9.3",
         "pure-sasl>=0.6.2",
         "six>=1.13.0"
     ],