Skip to content

Commit a47bde2

Browse files
committed
Revert "[SPARK-44222][BUILD][PYTHON] Upgrade grpc to 1.56.0"
This reverts commit f26bdb7.
1 parent 7ecdad5 commit a47bde2

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎.github/workflows/build_and_test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ jobs:
256256
- name: Install Python packages (Python 3.8)
257257
if: (contains(matrix.modules, 'sql') && !contains(matrix.modules, 'sql-'))
258258
run: |
259-
python3.8 -m pip install 'numpy>=1.20.0' pyarrow pandas scipy unittest-xml-reporting 'grpcio==1.56.0' 'protobuf==3.19.5'
259+
python3.8 -m pip install 'numpy>=1.20.0' pyarrow pandas scipy unittest-xml-reporting 'grpcio==1.48.1' 'protobuf==3.19.5'
260260
python3.8 -m pip list
261261
# Run the tests.
262262
- name: Run tests
@@ -625,7 +625,7 @@ jobs:
625625
# Jinja2 3.0.0+ causes error when building with Sphinx.
626626
# See also https://issues.apache.org/jira/browse/SPARK-35375.
627627
python3.9 -m pip install 'flake8==3.9.0' pydata_sphinx_theme 'mypy==0.982' 'pytest==7.1.3' 'pytest-mypy-plugins==1.9.3' numpydoc 'jinja2<3.0.0' 'black==22.6.0'
628-
python3.9 -m pip install 'pandas-stubs==1.2.0.53' ipython 'grpcio==1.56.0' 'grpc-stubs==1.24.11' 'googleapis-common-protos-stubs==2.2.0'
628+
python3.9 -m pip install 'pandas-stubs==1.2.0.53' ipython 'grpcio==1.48.1' 'grpc-stubs==1.24.11' 'googleapis-common-protos-stubs==2.2.0'
629629
- name: Python linter
630630
run: PYTHON_EXECUTABLE=python3.9 ./dev/lint-python
631631
- name: Install dependencies for Python code generation check

‎connector/connect/common/src/main/buf.gen.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ plugins:
2222
out: gen/proto/csharp
2323
- plugin: buf.build/protocolbuffers/java:v21.7
2424
out: gen/proto/java
25-
- plugin: buf.build/grpc/ruby:v1.56.0
25+
- remote: buf.build/grpc/plugins/ruby:v1.47.0-1
2626
out: gen/proto/ruby
2727
- plugin: buf.build/protocolbuffers/ruby:v21.7
2828
out: gen/proto/ruby
2929
# Building the Python build and building the mypy interfaces.
3030
- plugin: buf.build/protocolbuffers/python:v21.7
3131
out: gen/proto/python
32-
- plugin: buf.build/grpc/python:v1.56.0
32+
- remote: buf.build/grpc/plugins/python:v1.47.0-1
3333
out: gen/proto/python
3434
- name: mypy
3535
out: gen/proto/python

‎dev/create-release/spark-rm/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ARG APT_INSTALL="apt-get install --no-install-recommends -y"
4242
# We should use the latest Sphinx version once this is fixed.
4343
# TODO(SPARK-35375): Jinja2 3.0.0+ causes error when building with Sphinx.
4444
# See also https://issues.apache.org/jira/browse/SPARK-35375.
45-
ARG PIP_PKGS="sphinx==3.0.4 mkdocs==1.1.2 numpy==1.20.3 pydata_sphinx_theme==0.4.1 ipython==7.19.0 nbsphinx==0.8.0 numpydoc==1.1.0 jinja2==2.11.3 twine==3.4.1 sphinx-plotly-directive==0.1.3 pandas==1.5.3 pyarrow==3.0.0 plotly==5.4.0 markupsafe==2.0.1 docutils<0.17 grpcio==1.56.0 protobuf==4.21.6 grpcio-status==1.56.0 googleapis-common-protos==1.56.4"
45+
ARG PIP_PKGS="sphinx==3.0.4 mkdocs==1.1.2 numpy==1.20.3 pydata_sphinx_theme==0.4.1 ipython==7.19.0 nbsphinx==0.8.0 numpydoc==1.1.0 jinja2==2.11.3 twine==3.4.1 sphinx-plotly-directive==0.1.3 pandas==1.5.3 pyarrow==3.0.0 plotly==5.4.0 markupsafe==2.0.1 docutils<0.17 grpcio==1.48.1 protobuf==4.21.6 grpcio-status==1.48.1 googleapis-common-protos==1.56.4"
4646
ARG GEM_PKGS="bundler:2.3.8"
4747

4848
# Install extra needed repos and refresh.

‎dev/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ black==22.6.0
5050
py
5151

5252
# Spark Connect (required)
53-
grpcio==1.56.0
54-
grpcio-status==1.56.0
53+
grpcio==1.48.1
54+
grpcio-status==1.48.1
5555
protobuf==3.19.5
5656
googleapis-common-protos==1.56.4
5757

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
<!-- Version used in Connect -->
289289
<connect.guava.version>32.0.1-jre</connect.guava.version>
290290
<guava.failureaccess.version>1.0.1</guava.failureaccess.version>
291-
<io.grpc.version>1.56.0</io.grpc.version>
291+
<io.grpc.version>1.47.0</io.grpc.version>
292292
<mima.version>1.1.2</mima.version>
293293
<tomcat.annotations.api.version>6.0.53</tomcat.annotations.api.version>
294294

‎project/SparkBuild.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ object BuildCommons {
9191
// SPARK-41247: needs to be consistent with `protobuf.version` in `pom.xml`.
9292
val protoVersion = "3.23.2"
9393
// GRPC version used for Spark Connect.
94-
val gprcVersion = "1.56.0"
94+
val gprcVersion = "1.47.0"
9595
}
9696

9797
object SparkBuild extends PomBuild {

‎python/docs/source/getting_started/install.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ Package Minimum supported version Note
159159
`pandas` 1.0.5 Required for pandas API on Spark and Spark Connect; Optional for Spark SQL
160160
`pyarrow` 4.0.0 Required for pandas API on Spark and Spark Connect; Optional for Spark SQL
161161
`numpy` 1.15 Required for pandas API on Spark and MLLib DataFrame-based API; Optional for Spark SQL
162-
`grpcio` 1.56.0 Required for Spark Connect
163-
`grpcio-status` 1.56.0 Required for Spark Connect
162+
`grpc` 1.48.1 Required for Spark Connect
163+
`grpcio-status` 1.48.1 Required for Spark Connect
164164
`googleapis-common-protos` 1.56.4 Required for Spark Connect
165165
========================== ========================= ======================================================================================
166166

‎python/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def _supports_symlinks():
132132
# Also don't forget to update python/docs/source/getting_started/install.rst.
133133
_minimum_pandas_version = "1.0.5"
134134
_minimum_pyarrow_version = "4.0.0"
135-
_minimum_grpc_version = "1.56.0"
135+
_minimum_grpc_version = "1.48.1"
136136
_minimum_googleapis_common_protos_version = "1.56.4"
137137

138138

0 commit comments

Comments
 (0)