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

Update the upper bound for google-auth-httplib2 to 'google-auth-httplib2>=0.1.0,<0.3.0' #30962

Merged
merged 11 commits into from
Apr 16, 2024
Merged

Update the upper bound for google-auth-httplib2 to 'google-auth-httplib2>=0.1.0,<0.3.0' #30962

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eaac6f8
Test 'google-auth-httplib2>=0.1.0,<=0.2.0'
liferoad Apr 13, 2024
3800c78
Merge branch 'master' into auth-httplib2
liferoad Apr 15, 2024
c5b1f9d
update the base image requirements
liferoad Apr 15, 2024
98ce9a6
added greenlet==3.0.3 back
liferoad Apr 15, 2024
827704c
fixed pyt38
liferoad Apr 15, 2024
31543ec
fix py38
liferoad Apr 15, 2024
792730c
fixed tensorflow version
liferoad Apr 15, 2024
ca59e2d
ignore integration_tests.py
liferoad Apr 15, 2024
aff200e
fix typing_extensions
liferoad Apr 16, 2024
0de1eb5
fix typing_extensions
liferoad Apr 16, 2024
e3ed685
Remove tf versions
liferoad Apr 16, 2024
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
14 changes: 7 additions & 7 deletions sdks/python/container/py310/base_image_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ google-auth-httplib2==0.2.0
google-cloud-aiplatform==1.47.0
google-cloud-bigquery==3.20.1
google-cloud-bigquery-storage==2.24.0
google-cloud-bigtable==2.23.0
google-cloud-bigtable==2.23.1
google-cloud-core==2.4.1
google-cloud-datastore==2.19.0
google-cloud-dlp==3.16.0
google-cloud-language==2.13.3
google-cloud-profiler==4.1.0
google-cloud-pubsub==2.21.1
google-cloud-pubsublite==1.9.0
google-cloud-pubsublite==1.10.0
google-cloud-recommendations-ai==0.10.10
google-cloud-resource-manager==1.12.3
google-cloud-spanner==3.44.0
Expand All @@ -84,11 +84,11 @@ guppy3==3.1.4.post1
hdfs==2.7.3
httplib2==0.22.0
hypothesis==6.100.1
idna==3.6
idna==3.7
iniconfig==2.0.0
joblib==1.4.0
Js2Py==0.74
jsonpickle==3.0.3
jsonpickle==3.0.4
jsonschema==4.21.1
jsonschema-specifications==2023.12.1
mmh3==4.1.0
Expand All @@ -112,8 +112,8 @@ pyarrow-hotfix==0.6
pyasn1==0.6.0
pyasn1_modules==0.4.0
pycparser==2.22
pydantic==2.6.4
pydantic_core==2.16.3
pydantic==2.7.0
pydantic_core==2.18.1
pydot==1.4.2
PyHamcrest==2.1.0
pyjsparser==2.7.1
Expand Down Expand Up @@ -142,7 +142,7 @@ six==1.16.0
sortedcontainers==2.4.0
soupsieve==2.5
SQLAlchemy==2.0.29
sqlparse==0.4.4
sqlparse==0.5.0
tenacity==8.2.3
testcontainers==3.7.1
threadpoolctl==3.4.0
Expand Down
14 changes: 7 additions & 7 deletions sdks/python/container/py311/base_image_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ google-auth-httplib2==0.2.0
google-cloud-aiplatform==1.47.0
google-cloud-bigquery==3.20.1
google-cloud-bigquery-storage==2.24.0
google-cloud-bigtable==2.23.0
google-cloud-bigtable==2.23.1
google-cloud-core==2.4.1
google-cloud-datastore==2.19.0
google-cloud-dlp==3.16.0
google-cloud-language==2.13.3
google-cloud-profiler==4.1.0
google-cloud-pubsub==2.21.1
google-cloud-pubsublite==1.9.0
google-cloud-pubsublite==1.10.0
google-cloud-recommendations-ai==0.10.10
google-cloud-resource-manager==1.12.3
google-cloud-spanner==3.44.0
Expand All @@ -82,11 +82,11 @@ guppy3==3.1.4.post1
hdfs==2.7.3
httplib2==0.22.0
hypothesis==6.100.1
idna==3.6
idna==3.7
iniconfig==2.0.0
joblib==1.4.0
Js2Py==0.74
jsonpickle==3.0.3
jsonpickle==3.0.4
jsonschema==4.21.1
jsonschema-specifications==2023.12.1
mmh3==4.1.0
Expand All @@ -110,8 +110,8 @@ pyarrow-hotfix==0.6
pyasn1==0.6.0
pyasn1_modules==0.4.0
pycparser==2.22
pydantic==2.6.4
pydantic_core==2.16.3
pydantic==2.7.0
pydantic_core==2.18.1
pydot==1.4.2
PyHamcrest==2.1.0
pyjsparser==2.7.1
Expand Down Expand Up @@ -140,7 +140,7 @@ six==1.16.0
sortedcontainers==2.4.0
soupsieve==2.5
SQLAlchemy==2.0.29
sqlparse==0.4.4
sqlparse==0.5.0
tenacity==8.2.3
testcontainers==3.7.1
threadpoolctl==3.4.0
Expand Down
14 changes: 7 additions & 7 deletions 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 @@ -59,14 +59,14 @@ google-auth-httplib2==0.2.0
google-cloud-aiplatform==1.47.0
google-cloud-bigquery==3.20.1
google-cloud-bigquery-storage==2.24.0
google-cloud-bigtable==2.23.0
google-cloud-bigtable==2.23.1
google-cloud-core==2.4.1
google-cloud-datastore==2.19.0
google-cloud-dlp==3.16.0
google-cloud-language==2.13.3
google-cloud-profiler==4.1.0
google-cloud-pubsub==2.21.1
google-cloud-pubsublite==1.9.0
google-cloud-pubsublite==1.10.0
google-cloud-recommendations-ai==0.10.10
google-cloud-resource-manager==1.12.3
google-cloud-spanner==3.44.0
Expand All @@ -85,13 +85,13 @@ guppy3==3.1.4.post1
hdfs==2.7.3
httplib2==0.22.0
hypothesis==6.100.1
idna==3.6
idna==3.7
importlib_metadata==7.1.0
importlib_resources==6.4.0
iniconfig==2.0.0
joblib==1.4.0
Js2Py==0.74
jsonpickle==3.0.3
jsonpickle==3.0.4
jsonschema==4.21.1
jsonschema-specifications==2023.12.1
mmh3==4.1.0
Expand All @@ -116,8 +116,8 @@ pyarrow-hotfix==0.6
pyasn1==0.6.0
pyasn1_modules==0.4.0
pycparser==2.22
pydantic==2.6.4
pydantic_core==2.16.3
pydantic==2.7.0
pydantic_core==2.18.1
pydot==1.4.2
PyHamcrest==2.1.0
pyjsparser==2.7.1
Expand Down Expand Up @@ -146,7 +146,7 @@ six==1.16.0
sortedcontainers==2.4.0
soupsieve==2.5
SQLAlchemy==2.0.29
sqlparse==0.4.4
sqlparse==0.5.0
tenacity==8.2.3
testcontainers==3.7.1
threadpoolctl==3.4.0
Expand Down
14 changes: 7 additions & 7 deletions 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 @@ -58,14 +58,14 @@ google-auth-httplib2==0.2.0
google-cloud-aiplatform==1.47.0
google-cloud-bigquery==3.20.1
google-cloud-bigquery-storage==2.24.0
google-cloud-bigtable==2.23.0
google-cloud-bigtable==2.23.1
google-cloud-core==2.4.1
google-cloud-datastore==2.19.0
google-cloud-dlp==3.16.0
google-cloud-language==2.13.3
google-cloud-profiler==4.1.0
google-cloud-pubsub==2.21.1
google-cloud-pubsublite==1.9.0
google-cloud-pubsublite==1.10.0
google-cloud-recommendations-ai==0.10.10
google-cloud-resource-manager==1.12.3
google-cloud-spanner==3.44.0
Expand All @@ -84,12 +84,12 @@ guppy3==3.1.4.post1
hdfs==2.7.3
httplib2==0.22.0
hypothesis==6.100.1
idna==3.6
idna==3.7
importlib_metadata==7.1.0
iniconfig==2.0.0
joblib==1.4.0
Js2Py==0.74
jsonpickle==3.0.3
jsonpickle==3.0.4
jsonschema==4.21.1
jsonschema-specifications==2023.12.1
mmh3==4.1.0
Expand All @@ -113,8 +113,8 @@ pyarrow-hotfix==0.6
pyasn1==0.6.0
pyasn1_modules==0.4.0
pycparser==2.22
pydantic==2.6.4
pydantic_core==2.16.3
pydantic==2.7.0
pydantic_core==2.18.1
pydot==1.4.2
PyHamcrest==2.1.0
pyjsparser==2.7.1
Expand Down Expand Up @@ -143,7 +143,7 @@ six==1.16.0
sortedcontainers==2.4.0
soupsieve==2.5
SQLAlchemy==2.0.29
sqlparse==0.4.4
sqlparse==0.5.0
tenacity==8.2.3
testcontainers==3.7.1
threadpoolctl==3.4.0
Expand Down
1 change: 1 addition & 0 deletions sdks/python/scripts/generate_pydoc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ excluded_patterns=(
'apache_beam/utils/counters.*'
'apache_beam/utils/windowed_value.*'
'apache_beam/version.py'
'apache_beam/yaml/integration_tests.py'
'**/internal/*'
'*_it.py'
'*_pb2.py'
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ def get_portability_package_data():
# Until this issue is closed
# https://github.com/googleapis/google-cloud-python/issues/10566
'google-auth>=1.18.0,<3',
'google-auth-httplib2>=0.1.0,<0.2.0',
'google-auth-httplib2>=0.1.0,<0.3.0',
'google-cloud-datastore>=2.0.0,<3',
'google-cloud-pubsub>=2.1.0,<3',
'google-cloud-pubsublite>=1.2.0,<2',
Expand Down
1 change: 1 addition & 0 deletions sdks/python/tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ deps =
113: tensorflow_transform>=1.13.0,<1.14.0
# Help pip resolve conflict with typing-extensions due to an old version of tensorflow https://github.com/apache/beam/issues/30852
113: pydantic<2.0
113: tensorflow>=2.12rc1,<2.13
114: tensorflow_transform>=1.14.0,<1.15.0
commands =
bash {toxinidir}/scripts/run_pytest.sh {envname} 'apache_beam/ml/transforms apache_beam/examples/snippets/transforms/elementwise/mltransform_test.py'
Expand Down
Loading