Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion appengine/flexible/storage/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Flask==1.1.2
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
gunicorn==20.0.4; python_version > '3.0'
gunicorn==19.10.0; python_version < '3.0'
25 changes: 15 additions & 10 deletions asset/cloud-client/quickstart_batchgetassetshistory_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@
# limitations under the License.

import os
import time
import uuid

import backoff
from google.api_core.exceptions import InvalidArgument
from google.cloud import storage
import pytest

import quickstart_batchgetassetshistory

PROJECT = os.environ['GCLOUD_PROJECT']
BUCKET = 'assets-{}'.format(int(time.time()))
BUCKET = 'assets-{}'.format(uuid.uuid4().hex)


@pytest.fixture(scope='module')
Expand All @@ -47,12 +49,15 @@ def asset_bucket(storage_client):
def test_batch_get_assets_history(asset_bucket, capsys):
bucket_asset_name = '//storage.googleapis.com/{}'.format(BUCKET)
asset_names = [bucket_asset_name, ]
# There's some delay between bucket creation and when it's reflected in the
# backend.
time.sleep(15)
quickstart_batchgetassetshistory.batch_get_assets_history(
PROJECT, asset_names)
out, _ = capsys.readouterr()

if not out:

@backoff.on_exception(
backoff.expo, (AssertionError, InvalidArgument), max_time=30
)
def eventually_consistent_test():
quickstart_batchgetassetshistory.batch_get_assets_history(
PROJECT, asset_names)
out, _ = capsys.readouterr()

assert bucket_asset_name in out

eventually_consistent_test()
8 changes: 4 additions & 4 deletions asset/cloud-client/quickstart_createfeed_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import json
import os
import time
import uuid

from google.cloud import pubsub_v1
from google.cloud import resource_manager
Expand All @@ -27,9 +27,9 @@
json_data = open(os.environ["GOOGLE_APPLICATION_CREDENTIALS"]).read()
data = json.loads(json_data)
PROJECT = data['project_id']
ASSET_NAME = 'assets-{}'.format(int(time.time()))
FEED_ID = 'feed-{}'.format(int(time.time()))
TOPIC = 'topic-{}'.format(int(time.time()))
ASSET_NAME = 'assets-{}'.format(uuid.uuid4().hex)
FEED_ID = 'feed-{}'.format(uuid.uuid4().hex)
TOPIC = 'topic-{}'.format(uuid.uuid4().hex)


def test_create_feed(capsys):
Expand Down
8 changes: 4 additions & 4 deletions asset/cloud-client/quickstart_deletefeed_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.

import os
import time
import uuid

from google.cloud import pubsub_v1
from google.cloud import resource_manager
Expand All @@ -24,9 +24,9 @@
import quickstart_deletefeed

PROJECT = os.environ['GCLOUD_PROJECT']
ASSET_NAME = 'assets-{}'.format(int(time.time()))
FEED_ID = 'feed-{}'.format(int(time.time()))
TOPIC = 'topic-{}'.format(int(time.time()))
ASSET_NAME = 'assets-{}'.format(uuid.uuid4().hex)
FEED_ID = 'feed-{}'.format(uuid.uuid4().hex)
TOPIC = 'topic-{}'.format(uuid.uuid4().hex)


def test_delete_feed(capsys):
Expand Down
4 changes: 2 additions & 2 deletions asset/cloud-client/quickstart_exportassets_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
# limitations under the License.

import os
import time
import uuid

from google.cloud import storage
import pytest

import quickstart_exportassets

PROJECT = os.environ['GCLOUD_PROJECT']
BUCKET = 'assets-{}'.format(int(time.time()))
BUCKET = 'assets-{}'.format(uuid.uuid4().hex)


@pytest.fixture(scope='module')
Expand Down
8 changes: 4 additions & 4 deletions asset/cloud-client/quickstart_getfeed_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.

import os
import time
import uuid

from google.cloud import pubsub_v1
from google.cloud import resource_manager
Expand All @@ -25,9 +25,9 @@
import quickstart_getfeed

PROJECT = os.environ['GCLOUD_PROJECT']
ASSET_NAME = 'assets-{}'.format(int(time.time()))
FEED_ID = 'feed-{}'.format(int(time.time()))
TOPIC = 'topic-{}'.format(int(time.time()))
ASSET_NAME = 'assets-{}'.format(uuid.uuid4().hex)
FEED_ID = 'feed-{}'.format(uuid.uuid4().hex)
TOPIC = 'topic-{}'.format(uuid.uuid4().hex)


def test_get_feed(capsys):
Expand Down
10 changes: 5 additions & 5 deletions asset/cloud-client/quickstart_updatefeed_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.

import os
import time
import uuid

from google.cloud import pubsub_v1
from google.cloud import resource_manager
Expand All @@ -25,10 +25,10 @@
import quickstart_updatefeed

PROJECT = os.environ['GCLOUD_PROJECT']
ASSET_NAME = 'assets-{}'.format(int(time.time()))
FEED_ID = 'feed-{}'.format(int(time.time()))
TOPIC = 'topic-{}'.format(int(time.time()))
NEW_TOPIC = 'new-topic-{}'.format(int(time.time()))
ASSET_NAME = 'assets-{}'.format(uuid.uuid4().hex)
FEED_ID = 'feed-{}'.format(uuid.uuid4().hex)
TOPIC = 'topic-{}'.format(uuid.uuid4().hex)
NEW_TOPIC = 'new-topic-{}'.format(uuid.uuid4().hex)


def test_update_feed(capsys):
Expand Down
3 changes: 2 additions & 1 deletion asset/cloud-client/requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
pytest==5.3.2
backoff==1.10.0
pytest==5.4.1
2 changes: 1 addition & 1 deletion asset/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
google-cloud-asset==0.10.0
google-cloud-resource-manager==0.30.1
google-cloud-pubsub==1.4.3
2 changes: 1 addition & 1 deletion auth/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
2 changes: 1 addition & 1 deletion automl/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-automl==0.10.0
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
2 changes: 1 addition & 1 deletion codelabs/flex_and_vision/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Flask==1.1.2
gunicorn==20.0.4; python_version > '3.0'
gunicorn==19.10.0; python_version < '3.0'
google-cloud-vision==1.0.0
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
google-cloud-datastore==1.12.0
2 changes: 1 addition & 1 deletion dataproc/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ grpcio==1.28.1
google-auth==1.14.3
google-auth-httplib2==0.0.3
google-cloud==0.34.0
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
google-cloud-dataproc==0.7.0
2 changes: 1 addition & 1 deletion dlp/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
google-cloud-dlp==0.15.0
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
google-cloud-pubsub==1.4.3
google-cloud-datastore==1.12.0
google-cloud-bigquery==1.24.0
2 changes: 1 addition & 1 deletion document/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-documentai==0.1.0
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
2 changes: 1 addition & 1 deletion functions/http/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
xmltodict==0.12.0
2 changes: 1 addition & 1 deletion functions/imagemagick/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
google-cloud-vision==1.0.0
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
Wand==0.6.1
2 changes: 1 addition & 1 deletion functions/ocr/app/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
google-cloud-pubsub==1.4.3
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
google-cloud-translate==2.0.1
google-cloud-vision==1.0.0
2 changes: 1 addition & 1 deletion healthcare/api-client/fhir/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ google-api-python-client==1.8.2
google-auth-httplib2==0.0.3
google-auth==1.14.3
google-cloud==0.34.0
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
requests==2.23.0
2 changes: 1 addition & 1 deletion healthcare/api-client/v1/fhir/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ google-api-python-client==1.8.2
google-auth-httplib2==0.0.3
google-auth==1.14.3
google-cloud==0.34.0
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
2 changes: 1 addition & 1 deletion iot/api-client/gcs_file_to_device/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ google-auth==1.14.3
google-auth-httplib2==0.0.3
google-cloud-iot==1.0.0
google-cloud-pubsub==1.4.3
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
cryptography==2.9.2
paho-mqtt==1.5.0
pyjwt==1.7.1
2 changes: 1 addition & 1 deletion notebooks/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
google-cloud-bigquery[pandas,pyarrow]==1.24.0
matplotlib==3.1.2; python_version > '3.0'
matplotlib==2.2.5; python_version < '3.0'
2 changes: 1 addition & 1 deletion run/image-processing/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ pytest==5.3.0; python_version > "3.0"
pytest==4.6.6; python_version < "3.0"
gunicorn==20.0.4
google-cloud-vision==1.0.0
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
Wand==0.6.1
2 changes: 1 addition & 1 deletion storage/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-pubsub==1.4.3
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
2 changes: 1 addition & 1 deletion storage/signed_urls/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
google-auth==1.14.3
six==1.14.0
2 changes: 1 addition & 1 deletion translate/automl/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
google-cloud-translate==2.0.1
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
google-cloud-automl==0.10.0
2 changes: 1 addition & 1 deletion translate/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-translate==2.0.1
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
2 changes: 1 addition & 1 deletion video/cloud-client/analyze/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-videointelligence==1.14.0
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
2 changes: 1 addition & 1 deletion vision/cloud-client/detect/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-vision==1.0.0
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1
2 changes: 1 addition & 1 deletion vision/cloud-client/product_search/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-vision==1.0.0
google-cloud-storage==1.28.0
google-cloud-storage==1.28.1