From 86722c63365a37d14694da2cd6310fd19e84efb2 Mon Sep 17 00:00:00 2001 From: liferoad Date: Thu, 6 Mar 2025 14:58:16 -0500 Subject: [PATCH 1/4] Removed < 1.66 for grpcio --- sdks/python/setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sdks/python/setup.py b/sdks/python/setup.py index 9a45d287d49d..90d9cc11283d 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -354,8 +354,10 @@ def get_portability_package_data(): 'cloudpickle~=2.2.1', 'fastavro>=0.23.6,<2', 'fasteners>=0.3,<1.0', - # TODO(https://github.com/grpc/grpc/issues/37710): Unpin grpc - 'grpcio>=1.33.1,<2,!=1.48.0,!=1.59.*,!=1.60.*,!=1.61.*,!=1.62.0,!=1.62.1,<1.66.0', # pylint: disable=line-too-long + # Unpin grpc for now since we sunset Python 3.8 and this regression might be gone + # internal bug number: 372274680 + # external issue: https://github.com/grpc/grpc/issues/37710 + 'grpcio>=1.33.1,<2,!=1.48.0,!=1.59.*,!=1.60.*,!=1.61.*,!=1.62.0,!=1.62.1', # pylint: disable=line-too-long 'hdfs>=2.1.0,<3.0.0', 'httplib2>=0.8,<0.23.0', 'jsonschema>=4.0.0,<5.0.0', From a5d6560f0d6c9e0f0addf3f86b5dd7b2f1bd326a Mon Sep 17 00:00:00 2001 From: liferoad Date: Fri, 7 Mar 2025 10:08:25 -0500 Subject: [PATCH 2/4] Update sdks/python/setup.py Co-authored-by: tvalentyn --- sdks/python/setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdks/python/setup.py b/sdks/python/setup.py index 90d9cc11283d..5f201d06fca8 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -354,7 +354,8 @@ def get_portability_package_data(): 'cloudpickle~=2.2.1', 'fastavro>=0.23.6,<2', 'fasteners>=0.3,<1.0', - # Unpin grpc for now since we sunset Python 3.8 and this regression might be gone + # NOTE(https://github.com/grpc/grpc/issues/37710): Some grpc 1.66.0+ versions + # have a regression, which might not be reproducible in newer versions. # internal bug number: 372274680 # external issue: https://github.com/grpc/grpc/issues/37710 'grpcio>=1.33.1,<2,!=1.48.0,!=1.59.*,!=1.60.*,!=1.61.*,!=1.62.0,!=1.62.1', # pylint: disable=line-too-long From 4cc943352b9e534dfc2f84e932b617b05df78bca Mon Sep 17 00:00:00 2001 From: liferoad Date: Sat, 8 Mar 2025 09:24:53 -0500 Subject: [PATCH 3/4] updated the version upper bound --- sdks/python/setup.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sdks/python/setup.py b/sdks/python/setup.py index 5f201d06fca8..b79982710902 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -354,11 +354,14 @@ def get_portability_package_data(): 'cloudpickle~=2.2.1', 'fastavro>=0.23.6,<2', 'fasteners>=0.3,<1.0', - # NOTE(https://github.com/grpc/grpc/issues/37710): Some grpc 1.66.0+ versions - # have a regression, which might not be reproducible in newer versions. + # NOTE(https://github.com/grpc/grpc/issues/37710): + # Some grpc 1.66.0+ versions have a regression, + # which might not be reproducible in newer versions. # internal bug number: 372274680 # external issue: https://github.com/grpc/grpc/issues/37710 - 'grpcio>=1.33.1,<2,!=1.48.0,!=1.59.*,!=1.60.*,!=1.61.*,!=1.62.0,!=1.62.1', # pylint: disable=line-too-long + # grpcio rc versions can break the build on Mac. Use 1.71 here. + # Error message: grpcio 1.71.0rc2 is not supported on this platform. + 'grpcio>=1.33.1,<2,!=1.48.0,!=1.59.*,!=1.60.*,!=1.61.*,!=1.62.0,!=1.62.1,<1.71', # pylint: disable=line-too-long 'hdfs>=2.1.0,<3.0.0', 'httplib2>=0.8,<0.23.0', 'jsonschema>=4.0.0,<5.0.0', From d6fd6fafe1b9824bcf43e43975e77b6a154098e8 Mon Sep 17 00:00:00 2001 From: liferoad Date: Sat, 8 Mar 2025 10:02:38 -0500 Subject: [PATCH 4/4] skip pip check for lint --- sdks/python/setup.py | 4 +--- sdks/python/tox.ini | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sdks/python/setup.py b/sdks/python/setup.py index b79982710902..9a82c2579adf 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -359,9 +359,7 @@ def get_portability_package_data(): # which might not be reproducible in newer versions. # internal bug number: 372274680 # external issue: https://github.com/grpc/grpc/issues/37710 - # grpcio rc versions can break the build on Mac. Use 1.71 here. - # Error message: grpcio 1.71.0rc2 is not supported on this platform. - 'grpcio>=1.33.1,<2,!=1.48.0,!=1.59.*,!=1.60.*,!=1.61.*,!=1.62.0,!=1.62.1,<1.71', # pylint: disable=line-too-long + 'grpcio>=1.33.1,<2,!=1.48.0,!=1.59.*,!=1.60.*,!=1.61.*,!=1.62.0,!=1.62.1', # pylint: disable=line-too-long 'hdfs>=2.1.0,<3.0.0', 'httplib2>=0.8,<0.23.0', 'jsonschema>=4.0.0,<5.0.0', diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini index 25d44259fd75..8b6bb5df6c56 100644 --- a/sdks/python/tox.ini +++ b/sdks/python/tox.ini @@ -162,6 +162,12 @@ deps = pylint==2.17.5 isort==4.2.15 flake8==4.0.1 +# https://github.com/grpc/grpc/issues/37660: ignore pip check +commands_pre = + python --version + pip --version + # pip check + bash {toxinidir}/scripts/run_tox_cleanup.sh commands = pylint --version time {toxinidir}/scripts/run_pylint.sh