Skip to content

Commit

Permalink
Bump Python protobuf dependency to 4.x
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 576034997
  • Loading branch information
rbrush authored and copybara-github committed Oct 15, 2024
1 parent 1b4e059 commit baa9ed7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ jobs:
matrix:
python-version: ["3.8", "3.10", "3.11"]
steps:
# Use 25.x for protobuf 4 compatibility: https://protobuf.dev/support/version-support/#python
- name: Install Protoc
uses: arduino/setup-protoc@v3
with:
version: "25.x"

- name: Checkout
uses: actions/checkout@v3

Expand All @@ -15,8 +21,5 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Install protoc
run: sudo apt install -y protobuf-compiler

- name: Test
run: ./run_tests.sh
3 changes: 1 addition & 2 deletions google-fhir-core/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ def main():
'antlr4-python3-runtime~=4.9.3',
'backports.zoneinfo~=0.2.1;python_version<"3.9"',
'immutabledict~=2.2',
# TODO(b/276635321): Fix compatibility issue with protobuf 4.x
'protobuf~=3.19',
'protobuf~=4.23',
'python-dateutil~=2.8',
'stringcase==1.2.0',
],
Expand Down
3 changes: 1 addition & 2 deletions google-fhir-r4/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@ def main():
f'google-fhir-core~={version}',
'backports.zoneinfo~=0.2.1;python_version<"3.9"',
'immutabledict~=2.2',
# TODO(b/276635321): Fix compatibility issue with protobuf 4.x
'protobuf~=3.19',
'protobuf~=4.23',
'python-dateutil~=2.8',
],
package_data={'google.fhir.r4.data': ['*.tgz']},
Expand Down
2 changes: 1 addition & 1 deletion google-fhir-views/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def main():
# Pin to numpy 1 to avoid binary compatibility changes in numpy 2.
'numpy~=1.24',
'pandas~=1.1',
'protobuf~=3.19',
'protobuf~=4.23',
'python-dateutil~=2.8',
'requests~=2.27',
'requests-mock~=1.9',
Expand Down

0 comments on commit baa9ed7

Please sign in to comment.