Skip to content

Commit

Permalink
[SPARK-41240][CONNECT][BUILD][INFRA][DOCS] Upgrade Protobuf to 3.19.5
Browse files Browse the repository at this point in the history
### What changes were proposed in this pull request?
Upgrade Protobuf from 3.19.4 to 3.19.5

### Why are the changes needed?
[CVE-2022-1941](https://nvd.nist.gov/vuln/detail/CVE-2022-1941)

### Does this PR introduce _any_ user-facing change?
No.

### How was this patch tested?
Pass GA

Closes apache#38774 from bjornjorgensen/protobuf-3.19.5.

Lead-authored-by: Bjørn Jørgensen <[email protected]>
Co-authored-by: Bjorn Jorgensen <[email protected]>
Co-authored-by: Bjørn <[email protected]>
Signed-off-by: Ruifeng Zheng <[email protected]>
  • Loading branch information
bjornjorgensen authored and zhengruifeng committed Nov 25, 2022
1 parent eb91d8b commit da71626
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ jobs:
- name: Install Python packages (Python 3.8)
if: (contains(matrix.modules, 'sql') && !contains(matrix.modules, 'sql-'))
run: |
python3.8 -m pip install 'numpy>=1.20.0' pyarrow pandas scipy unittest-xml-reporting 'grpcio==1.48.1' 'protobuf==3.19.4'
python3.8 -m pip install 'numpy>=1.20.0' pyarrow pandas scipy unittest-xml-reporting 'grpcio==1.48.1' 'protobuf==3.19.5'
python3.8 -m pip list
# Run the tests.
- name: Run tests
Expand Down Expand Up @@ -589,7 +589,7 @@ jobs:
# See also https://issues.apache.org/jira/browse/SPARK-38279.
python3.9 -m pip install 'sphinx<3.1.0' mkdocs pydata_sphinx_theme ipython nbsphinx numpydoc 'jinja2<3.0.0' 'markupsafe==2.0.1' 'pyzmq<24.0.0'
python3.9 -m pip install ipython_genutils # See SPARK-38517
python3.9 -m pip install sphinx_plotly_directive 'numpy>=1.20.0' pyarrow pandas 'plotly>=4.8' 'grpcio==1.48.1' 'protobuf==3.19.4' 'mypy-protobuf==3.3.0'
python3.9 -m pip install sphinx_plotly_directive 'numpy>=1.20.0' pyarrow pandas 'plotly>=4.8' 'grpcio==1.48.1' 'protobuf==3.19.5' 'mypy-protobuf==3.3.0'
python3.9 -m pip install 'docutils<0.18.0' # See SPARK-39421
apt-get update -y
apt-get install -y ruby ruby-dev
Expand Down
2 changes: 1 addition & 1 deletion connector/connect/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ To use the release version of Spark Connect:

### Generate proto generated files for the Python client
1. Install `buf version 1.8.0`: https://docs.buf.build/installation
2. Run `pip install grpcio==1.48.1 protobuf==3.19.4 mypy-protobuf==3.3.0`
2. Run `pip install grpcio==1.48.1 protobuf==3.19.5 mypy-protobuf==3.3.0`
3. Run `./connector/connect/dev/generate_protos.sh`
4. Optional Check `./dev/check-codegen-python.py`

Expand Down
2 changes: 1 addition & 1 deletion dev/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ black==22.6.0

# Spark Connect (required)
grpcio==1.48.1
protobuf==3.19.4
protobuf==3.19.5

# Spark Connect python proto generation plugin (optional)
mypy-protobuf==3.3.0

0 comments on commit da71626

Please sign in to comment.