Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump google-cloud-spanner version for py containers #23480

Merged
merged 6 commits into from
Oct 5, 2022
Merged

Bump google-cloud-spanner version for py containers #23480

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c370fe9
Bump google-cloud-spanner version for py containers
Abacn Oct 4, 2022
a5da891
Pin spanner client version to 3.x
Abacn Oct 4, 2022
e701608
regenerate base_image_requirements
Abacn Oct 4, 2022
71fb187
Remove grpcio-gcp dependency
Abacn Oct 4, 2022
a3158ea
[Test only] only run spanner test for postcommit
Abacn Oct 5, 2022
2cd1c31
Revert "[Test only] only run spanner test for postcommit"
Abacn Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
* Decreased TextSource CPU utilization by 2.3x (Java) ([#23193](https://github.com/apache/beam/issues/23193)).
* Fixed bug when using SpannerIO with RuntimeValueProvider options (Java) ([#22146](https://github.com/apache/beam/issues/22146)).
* Fixed issue for unicode rendering on WriteToBigQuery ([#10785](https://github.com/apache/beam/issues/10785))
* Bumped google-cloud-spanner dependency version to 3.x for Python SDK ([#21198](https://github.com/apache/beam/issues/21198)).

## New Features / Improvements

Expand All @@ -78,6 +79,8 @@
## Bugfixes

* Fixed X (Java/Python) ([#X](https://github.com/apache/beam/issues/X)).
* Fixed Python cross-language JDBC IO Connector cannot read or write rows containing Numeric/Decimal type values ([#19817](https://github.com/apache/beam/issues/19817)).

## Known Issues

* ([#X](https://github.com/apache/beam/issues/X)).
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/py37/base_image_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ google-cloud-profiler==3.1.0
google-cloud-pubsub==2.13.7
google-cloud-pubsublite==1.5.0
google-cloud-recommendations-ai==0.7.1
google-cloud-spanner==1.19.3
google-cloud-spanner==3.22.0
Copy link
Contributor

@tvalentyn tvalentyn Oct 4, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests fail with:
09:43:29 google-cloud-spanner 3.22.0 requires sqlparse, which is not installed.

these files need to be regenerated (see header at the top of the file).

Also, I think it would be safer to set the upper bound >=3.0.0 in setup.py.

google-cloud-storage==2.5.0
google-cloud-videointelligence==1.16.3
google-cloud-vision==1.0.2
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/py38/base_image_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ google-cloud-profiler==3.1.0
google-cloud-pubsub==2.13.7
google-cloud-pubsublite==1.5.0
google-cloud-recommendations-ai==0.7.1
google-cloud-spanner==1.19.3
google-cloud-spanner==3.22.0
google-cloud-storage==2.5.0
google-cloud-videointelligence==1.16.3
google-cloud-vision==1.0.2
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/py39/base_image_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ google-cloud-profiler==3.1.0
google-cloud-pubsub==2.13.7
google-cloud-pubsublite==1.5.0
google-cloud-recommendations-ai==0.7.1
google-cloud-spanner==1.19.3
google-cloud-spanner==3.22.0
google-cloud-storage==2.5.0
google-cloud-videointelligence==1.16.3
google-cloud-vision==1.0.2
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/run_generate_requirements.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# 2) A list of dependencies from base_image_requirements_manual.txt, which we
# maintain manually.

# It is recommended to run this script via gralde commands such as:
# It is recommended to run this script via gradle commands such as:
# ./gradlew :sdks:python:container:generatePythonRequirementsAll
# ./gradlew :sdks:python:container:py38:generatePythonRequirements

Expand Down
6 changes: 1 addition & 5 deletions sdks/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,6 @@ def get_portability_package_data():
'gcp': [
'cachetools>=3.1.0,<5',
'google-apitools>=0.5.31,<0.5.32',
# Transitive dep. Required for google-cloud-spanner v1.
# See: https://github.com/apache/beam/issues/22454
'google-api-core!=2.8.2,<3',
# NOTE: Maintainers, please do not require google-auth>=2.x.x
# Until this issue is closed
# https://github.com/googleapis/google-cloud-python/issues/10566
Expand All @@ -301,8 +298,7 @@ def get_portability_package_data():
'google-cloud-bigquery-storage>=2.6.3,<2.14',
'google-cloud-core>=0.28.1,<3',
'google-cloud-bigtable>=0.31.1,<2',
# google-cloud-spanner 2.x causes dependency parsing backoff
'google-cloud-spanner>=1.13.0,!=2,<4',
'google-cloud-spanner>=3.0.0,<4',
'grpcio-gcp>=0.2.2,<1',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is also a spanner v1 dep.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, introduced in #9606. Will remove

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reran generate requirements

# GCP Packages required by ML functionality
'google-cloud-dlp>=3.0.0,<4',
Expand Down