diff --git a/appengine/flexible/storage/requirements-test.txt b/appengine/flexible/storage/requirements-test.txt index 84f89b1d26a..779ee8e2cbb 100644 --- a/appengine/flexible/storage/requirements-test.txt +++ b/appengine/flexible/storage/requirements-test.txt @@ -1,2 +1,3 @@ pytest==6.2.4 -google-cloud-storage==1.44.0 \ No newline at end of file +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' diff --git a/appengine/flexible/storage/requirements.txt b/appengine/flexible/storage/requirements.txt index 676f2f8a222..ab046b36266 100644 --- a/appengine/flexible/storage/requirements.txt +++ b/appengine/flexible/storage/requirements.txt @@ -1,4 +1,5 @@ Flask==2.0.2 -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' gunicorn==20.1.0; python_version > '3.0' gunicorn==19.10.0; python_version < '3.0' diff --git a/appengine/standard/migration/storage/requirements.txt b/appengine/standard/migration/storage/requirements.txt index 883cd97ed8b..50a6f51d3fe 100644 --- a/appengine/standard/migration/storage/requirements.txt +++ b/appengine/standard/migration/storage/requirements.txt @@ -1,3 +1,4 @@ -google-cloud-storage==1.44.0 +google-cloud-storage==1.44.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' Flask==1.1.4; python_version < '3.0' Flask==2.0.0; python_version > '3.0' diff --git a/auth/cloud-client/requirements.txt b/auth/cloud-client/requirements.txt index 8bb52dd0871..a72806fc358 100644 --- a/auth/cloud-client/requirements.txt +++ b/auth/cloud-client/requirements.txt @@ -1 +1,2 @@ -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' diff --git a/auth/downscoping/requirements-test.txt b/auth/downscoping/requirements-test.txt index 84f89b1d26a..779ee8e2cbb 100644 --- a/auth/downscoping/requirements-test.txt +++ b/auth/downscoping/requirements-test.txt @@ -1,2 +1,3 @@ pytest==6.2.4 -google-cloud-storage==1.44.0 \ No newline at end of file +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' diff --git a/auth/downscoping/requirements.txt b/auth/downscoping/requirements.txt index 4ee1eb6db75..2aba2830df5 100644 --- a/auth/downscoping/requirements.txt +++ b/auth/downscoping/requirements.txt @@ -1,2 +1,3 @@ google-auth==2.5.0 -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' diff --git a/codelabs/flex_and_vision/requirements.txt b/codelabs/flex_and_vision/requirements.txt index 67f3a1d41e0..7ae855fbff1 100644 --- a/codelabs/flex_and_vision/requirements.txt +++ b/codelabs/flex_and_vision/requirements.txt @@ -2,5 +2,6 @@ Flask==2.0.2 gunicorn==20.1.0; python_version > '3.0' gunicorn==19.10.0; python_version < '3.0' google-cloud-vision==2.6.3 -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' google-cloud-datastore==2.4.0 diff --git a/composer/cicd_sample/utils/requirements.txt b/composer/cicd_sample/utils/requirements.txt index a608e00dd92..6a37e6cdfd8 100644 --- a/composer/cicd_sample/utils/requirements.txt +++ b/composer/cicd_sample/utils/requirements.txt @@ -1 +1 @@ -google-cloud-storage==1.44.0 \ No newline at end of file +google-cloud-storage==2.1.0 \ No newline at end of file diff --git a/data-science-onramp/data-ingestion/requirements.txt b/data-science-onramp/data-ingestion/requirements.txt index 91416a6df38..4e487218e3a 100644 --- a/data-science-onramp/data-ingestion/requirements.txt +++ b/data-science-onramp/data-ingestion/requirements.txt @@ -1,6 +1,7 @@ #grpcio==1.29.0 #google-auth==1.16.0 #google-auth-httplib2==0.0.3 -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' google-cloud-dataproc==3.3.0 -google-cloud-bigquery==2.33.0 \ No newline at end of file +google-cloud-bigquery==2.33.0 diff --git a/data-science-onramp/data-processing/requirements.txt b/data-science-onramp/data-processing/requirements.txt index 69e75a00ac5..fb1278235ce 100644 --- a/data-science-onramp/data-processing/requirements.txt +++ b/data-science-onramp/data-processing/requirements.txt @@ -1,2 +1,3 @@ -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' google-cloud-dataproc==3.3.0 diff --git a/dataflow/custom-containers/minimal/requirements-test.txt b/dataflow/custom-containers/minimal/requirements-test.txt index dfd63a89ec0..ea975462dc5 100644 --- a/dataflow/custom-containers/minimal/requirements-test.txt +++ b/dataflow/custom-containers/minimal/requirements-test.txt @@ -1,3 +1,3 @@ -google-cloud-storage==1.43.0 +google-cloud-storage==2.1.0 pytest-xdist==2.5.0 pytest==6.2.4 \ No newline at end of file diff --git a/dataflow/custom-containers/ubuntu/requirements-test.txt b/dataflow/custom-containers/ubuntu/requirements-test.txt index dfd63a89ec0..ea975462dc5 100644 --- a/dataflow/custom-containers/ubuntu/requirements-test.txt +++ b/dataflow/custom-containers/ubuntu/requirements-test.txt @@ -1,3 +1,3 @@ -google-cloud-storage==1.43.0 +google-cloud-storage==2.1.0 pytest-xdist==2.5.0 pytest==6.2.4 \ No newline at end of file diff --git a/dataflow/flex-templates/streaming_beam/requirements-test.txt b/dataflow/flex-templates/streaming_beam/requirements-test.txt index a051d7a6878..ff1cbe74efe 100644 --- a/dataflow/flex-templates/streaming_beam/requirements-test.txt +++ b/dataflow/flex-templates/streaming_beam/requirements-test.txt @@ -1,5 +1,5 @@ google-api-python-client==2.37.0 -google-cloud-storage==1.44.0 +google-cloud-storage==2.1.0 pytest-xdist==2.5.0 pytest==6.2.4 pyyaml==6.0 \ No newline at end of file diff --git a/dataflow/gpu-examples/pytorch-minimal/requirements-test.txt b/dataflow/gpu-examples/pytorch-minimal/requirements-test.txt index f54124bae4d..2cbcd35d165 100644 --- a/dataflow/gpu-examples/pytorch-minimal/requirements-test.txt +++ b/dataflow/gpu-examples/pytorch-minimal/requirements-test.txt @@ -1,4 +1,4 @@ google-api-python-client==2.37.0 -google-cloud-storage==1.44.0 +google-cloud-storage==2.1.0 pytest-xdist==2.5.0 pytest==6.2.4 diff --git a/dataflow/gpu-examples/tensorflow-landsat-prime/requirements-test.txt b/dataflow/gpu-examples/tensorflow-landsat-prime/requirements-test.txt index 742c4804eb7..988a8ccbebf 100644 --- a/dataflow/gpu-examples/tensorflow-landsat-prime/requirements-test.txt +++ b/dataflow/gpu-examples/tensorflow-landsat-prime/requirements-test.txt @@ -1,3 +1,3 @@ google-api-python-client==2.37.0 -google-cloud-storage==1.44.0 +google-cloud-storage==2.1.0 pytest==6.2.4 diff --git a/dataflow/gpu-examples/tensorflow-landsat/requirements-test.txt b/dataflow/gpu-examples/tensorflow-landsat/requirements-test.txt index 742c4804eb7..988a8ccbebf 100644 --- a/dataflow/gpu-examples/tensorflow-landsat/requirements-test.txt +++ b/dataflow/gpu-examples/tensorflow-landsat/requirements-test.txt @@ -1,3 +1,3 @@ google-api-python-client==2.37.0 -google-cloud-storage==1.44.0 +google-cloud-storage==2.1.0 pytest==6.2.4 diff --git a/dataflow/gpu-examples/tensorflow-minimal/requirements-test.txt b/dataflow/gpu-examples/tensorflow-minimal/requirements-test.txt index 742c4804eb7..988a8ccbebf 100644 --- a/dataflow/gpu-examples/tensorflow-minimal/requirements-test.txt +++ b/dataflow/gpu-examples/tensorflow-minimal/requirements-test.txt @@ -1,3 +1,3 @@ google-api-python-client==2.37.0 -google-cloud-storage==1.44.0 +google-cloud-storage==2.1.0 pytest==6.2.4 diff --git a/functions/http/requirements.txt b/functions/http/requirements.txt index b962a3da07c..4bf4e981512 100644 --- a/functions/http/requirements.txt +++ b/functions/http/requirements.txt @@ -1,2 +1,3 @@ -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' xmltodict==0.12.0 diff --git a/functions/imagemagick/requirements.txt b/functions/imagemagick/requirements.txt index 228e06b44e4..ff95a8ddd44 100644 --- a/functions/imagemagick/requirements.txt +++ b/functions/imagemagick/requirements.txt @@ -1,3 +1,4 @@ google-cloud-vision==2.6.3 -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' Wand==0.6.7 diff --git a/functions/ocr/app/requirements.txt b/functions/ocr/app/requirements.txt index 57d9ef5c869..d448207ad57 100644 --- a/functions/ocr/app/requirements.txt +++ b/functions/ocr/app/requirements.txt @@ -1,4 +1,5 @@ google-cloud-pubsub==2.9.0 -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' google-cloud-translate==3.7.0 google-cloud-vision==2.6.3 diff --git a/healthcare/api-client/v1/fhir/requirements.txt b/healthcare/api-client/v1/fhir/requirements.txt index 462ddabe734..398dc973536 100644 --- a/healthcare/api-client/v1/fhir/requirements.txt +++ b/healthcare/api-client/v1/fhir/requirements.txt @@ -2,4 +2,5 @@ google-api-python-client==2.37.0 google-auth-httplib2==0.1.0 google-auth==2.5.0 google-cloud==0.34.0 -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' diff --git a/healthcare/api-client/v1beta1/fhir/requirements.txt b/healthcare/api-client/v1beta1/fhir/requirements.txt index 9b5cbc6a0ca..1dfee5c48a6 100644 --- a/healthcare/api-client/v1beta1/fhir/requirements.txt +++ b/healthcare/api-client/v1beta1/fhir/requirements.txt @@ -2,5 +2,6 @@ google-api-python-client==2.37.0 google-auth-httplib2==0.1.0 google-auth==2.5.0 google-cloud==0.34.0 -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' requests==2.27.1 diff --git a/iot/api-client/gcs_file_to_device/requirements.txt b/iot/api-client/gcs_file_to_device/requirements.txt index c32cd3416de..934dc262f84 100644 --- a/iot/api-client/gcs_file_to_device/requirements.txt +++ b/iot/api-client/gcs_file_to_device/requirements.txt @@ -3,7 +3,8 @@ google-auth==2.5.0 google-auth-httplib2==0.1.0 google-cloud-iot==2.4.0 google-cloud-pubsub==2.9.0 -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' cryptography==36.0.1 paho-mqtt==1.5.1 pyjwt==2.3.0 diff --git a/notebooks/requirements.txt b/notebooks/requirements.txt index c06d849cb84..fd9c71293ab 100644 --- a/notebooks/requirements.txt +++ b/notebooks/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-storage==1.44.0 +google-cloud-storage==2.1.0 google-cloud-bigquery[pandas,pyarrow]==2.33.0 matplotlib==3.5.1; python_version > '3.6' matplotlib==3.3.4; python_version == '3.6' diff --git a/people-and-planet-ai/image-classification/requirements-test.txt b/people-and-planet-ai/image-classification/requirements-test.txt index e027df96953..840174a8952 100644 --- a/people-and-planet-ai/image-classification/requirements-test.txt +++ b/people-and-planet-ai/image-classification/requirements-test.txt @@ -1,3 +1,3 @@ -google-cloud-storage==1.44.0 +google-cloud-storage==2.1.0 pytest-xdist==2.5.0 pytest==6.2.4 diff --git a/pubsublite/spark-connector/requirements-test.txt b/pubsublite/spark-connector/requirements-test.txt index 2e76307f258..2103a476bf8 100644 --- a/pubsublite/spark-connector/requirements-test.txt +++ b/pubsublite/spark-connector/requirements-test.txt @@ -1,4 +1,4 @@ google-cloud-dataproc==3.3.0 google-cloud-pubsublite==1.4.0 -google-cloud-storage==1.44.0 +google-cloud-storage==2.1.0 pytest==6.2.5 \ No newline at end of file diff --git a/run/image-processing/requirements.txt b/run/image-processing/requirements.txt index d53c5da87e9..acc64658f09 100644 --- a/run/image-processing/requirements.txt +++ b/run/image-processing/requirements.txt @@ -4,5 +4,5 @@ pytest==6.2.5; python_version > "3.0" pytest==4.6.11; python_version < "3.0" gunicorn==20.1.0 google-cloud-vision==2.6.3 -google-cloud-storage==1.44.0 +google-cloud-storage==2.1.0 Wand==0.6.7 diff --git a/storage/s3-sdk/requirements-test.txt b/storage/s3-sdk/requirements-test.txt index 1ba768c49e5..02432a141bc 100644 --- a/storage/s3-sdk/requirements-test.txt +++ b/storage/s3-sdk/requirements-test.txt @@ -1,3 +1,4 @@ backoff==1.11.1 pytest==6.2.4 -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' diff --git a/storage/signed_urls/requirements.txt b/storage/signed_urls/requirements.txt index c71eaa6b3a1..7df0ba19f24 100644 --- a/storage/signed_urls/requirements.txt +++ b/storage/signed_urls/requirements.txt @@ -1,3 +1,4 @@ -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' google-auth==2.5.0 six==1.16.0 diff --git a/storagetransfer/requirements-test.txt b/storagetransfer/requirements-test.txt index a6fbff6269a..2bbec42f367 100644 --- a/storagetransfer/requirements-test.txt +++ b/storagetransfer/requirements-test.txt @@ -1,4 +1,5 @@ backoff==1.11.1 boto3==1.20.26 -google-cloud-storage==1.44.0 +google-cloud-storage==2.0.0; python_version < '3.7' +google-cloud-storage==2.1.0; python_version > '3.6' pytest==6.2.4