Skip to content

Commit a675df9

Browse files
authored
Merge branch 'master' into import-style
2 parents 32fb0bb + 51ec826 commit a675df9

File tree

39 files changed

+38
-78
lines changed

39 files changed

+38
-78
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-bigquery==2.23.2
1+
google-cloud-bigquery==2.24.0
22
Flask==2.0.1

appengine/standard_python3/cloudsql/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ flask==2.0.1
22
# psycopg2==2.8.4
33
psycopg2-binary==2.9.1 # you will need either the binary or the regular - for more info see http://initd.org/psycopg/docs/install.html
44
PyMySQL==1.0.2
5-
SQLAlchemy==1.4.19
5+
SQLAlchemy==1.4.22
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-spanner==3.5.0
1+
google-cloud-spanner==3.8.0
22
Flask==2.0.1

bigquery/bqml/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
google-cloud-bigquery[pandas,bqstorage]==2.23.2
1+
google-cloud-bigquery[pandas,bqstorage]==2.24.0
22
google-cloud-bigquery-storage==2.6.3
33
pandas==1.1.5; python_version < '3.7'
44
pandas==1.2.0; python_version > '3.6'

bigquery/datalab-migration/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
grpcio==1.39.0
2-
google-cloud-bigquery[pandas,pyarrow]==2.23.2
2+
google-cloud-bigquery[pandas,pyarrow]==2.24.0
33
google-cloud-bigquery-storage==2.6.3
44
datalab==1.2.0
55
ipython==7.18.1; python_version > '3.6'

bigquery/pandas-gbq-migration/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
google-cloud-bigquery==2.23.2
1+
google-cloud-bigquery==2.24.0
22
google-cloud-bigquery-storage==2.6.3
33
pandas==1.1.5; python_version < '3.7'
44
pandas==1.2.4; python_version > '3.6'
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
SQLAlchemy==1.4.19
1+
SQLAlchemy==1.4.22
22
PyMySQL==1.0.2
33
tink==1.6.1
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Flask==2.0.1
2-
SQLAlchemy==1.4.19
2+
SQLAlchemy==1.4.22
33
PyMySQL==1.0.2
44
gunicorn==20.1.0
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
SQLAlchemy==1.4.19
1+
SQLAlchemy==1.4.22
22
pg8000==1.21.0
33
tink==1.6.1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Flask==2.0.1
22
pg8000==1.21.0
3-
SQLAlchemy==1.4.19
3+
SQLAlchemy==1.4.22
44
gunicorn==20.1.0
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SQLAlchemy==1.4.19
1+
SQLAlchemy==1.4.22
22
python-tds==1.11.0
33
sqlalchemy-pytds==0.3.1
44
tink==1.6.1

cloud-sql/sql-server/sqlalchemy/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Flask==2.0.1
2-
SQLAlchemy==1.4.19
2+
SQLAlchemy==1.4.22
33
python-tds==1.11.0
44
sqlalchemy-pytds==0.3.3
55
pyopenssl==20.0.1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
backoff==1.11.0
1+
backoff==1.11.1
22
pytest==6.2.4

data-science-onramp/data-ingestion/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
#google-auth-httplib2==0.0.3
44
google-cloud-storage==1.41.0
55
google-cloud-dataproc==2.5.0
6-
google-cloud-bigquery==2.23.2
6+
google-cloud-bigquery==2.24.0
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pytest==6.2.4
22
pandas==1.1.5; python_version < '3.7'
33
pandas==1.2.0; python_version > '3.6'
4-
google-cloud-bigquery==2.23.2
4+
google-cloud-bigquery==2.24.0
55
pyarrow==5.0.0
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Pillow==8.2.0
22
apache-beam[gcp]==2.31.0
33
rasterio==1.2.4
4-
tensorflow==2.5.1
4+
tensorflow==2.6.0
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
apache-beam[gcp]==2.31.0
2-
tensorflow==2.5.1
2+
tensorflow==2.6.0
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pytest==6.2.4
22
flask==2.0.1
3-
backoff==1.11.0
3+
backoff==1.11.1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
backoff==1.11.0
1+
backoff==1.11.1
22
pytest==6.2.4
33
flaky==3.7.0
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
backoff==1.11.0
1+
backoff==1.11.1
22
pytest==6.2.4

functions/spanner/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-spanner==3.5.0
1+
google-cloud-spanner==3.8.0
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pytest==6.2.4
2-
backoff==1.11.0
2+
backoff==1.11.1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pytest==6.2.4
2-
backoff==1.11.0
2+
backoff==1.11.1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pytest==6.2.4
2-
backoff==1.11.0
2+
backoff==1.11.1

healthcare/api-client/v1beta1/fhir/fhir_resources.py

-20
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
_BASE_URL = "https://healthcare.googleapis.com/v1beta1"
2424

2525

26-
# [START healthcare_get_session]
2726
def get_session(service_account_json):
2827
"""
2928
Returns an authorized Requests Session class using the service account
@@ -46,10 +45,6 @@ def get_session(service_account_json):
4645
return session
4746

4847

49-
# [END healthcare_get_session]
50-
51-
52-
# [START healthcare_create_resource]
5348
def create_patient(
5449
service_account_json, base_url, project_id, cloud_region, dataset_id, fhir_store_id
5550
):
@@ -82,10 +77,6 @@ def create_patient(
8277
return response
8378

8479

85-
# [END healthcare_create_resource]
86-
87-
88-
# [START healthcare_create_encounter]
8980
def create_encounter(
9081
service_account_json,
9182
base_url,
@@ -134,10 +125,6 @@ def create_encounter(
134125
return response
135126

136127

137-
# [END healthcare_create_encounter]
138-
139-
140-
# [START healthcare_create_observation]
141128
def create_observation(
142129
service_account_json,
143130
base_url,
@@ -183,10 +170,6 @@ def create_observation(
183170
return response
184171

185172

186-
# [END healthcare_create_observation]
187-
188-
189-
# [START healthcare_delete_resource]
190173
def delete_resource(
191174
service_account_json,
192175
base_url,
@@ -218,9 +201,6 @@ def delete_resource(
218201
return response
219202

220203

221-
# [END healthcare_delete_resource]
222-
223-
224204
# [START healthcare_conditional_update_resource]
225205
def conditional_update_resource(
226206
service_account_json,

healthcare/api-client/v1beta1/fhir/fhir_stores.py

-20
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from googleapiclient.errors import HttpError
2121

2222

23-
# [START healthcare_get_client]
2423
def get_client(service_account_json):
2524
"""Returns an authorized API client by discovering the Healthcare API and
2625
creating a service object using the service account credentials JSON."""
@@ -44,10 +43,6 @@ def get_client(service_account_json):
4443
)
4544

4645

47-
# [END healthcare_get_client]
48-
49-
50-
# [START healthcare_create_dataset]
5146
def create_dataset(service_account_json, project_id, cloud_region, dataset_id):
5247
"""Creates a dataset."""
5348
client = get_client(service_account_json)
@@ -71,10 +66,6 @@ def create_dataset(service_account_json, project_id, cloud_region, dataset_id):
7166
return ""
7267

7368

74-
# [END healthcare_create_dataset]
75-
76-
77-
# [START healthcare_delete_dataset]
7869
def delete_dataset(service_account_json, project_id, cloud_region, dataset_id):
7970
"""Deletes a dataset."""
8071
client = get_client(service_account_json)
@@ -93,10 +84,6 @@ def delete_dataset(service_account_json, project_id, cloud_region, dataset_id):
9384
return ""
9485

9586

96-
# [END healthcare_delete_dataset]
97-
98-
99-
# [START healthcare_create_fhir_store]
10087
def create_fhir_store(
10188
service_account_json, project_id, cloud_region, dataset_id, fhir_store_id
10289
):
@@ -121,10 +108,6 @@ def create_fhir_store(
121108
return response
122109

123110

124-
# [END healthcare_create_fhir_store]
125-
126-
127-
# [START healthcare_delete_fhir_store]
128111
def delete_fhir_store(
129112
service_account_json, project_id, cloud_region, dataset_id, fhir_store_id
130113
):
@@ -148,9 +131,6 @@ def delete_fhir_store(
148131
return response
149132

150133

151-
# [END healthcare_delete_fhir_store]
152-
153-
154134
def parse_command_line_args():
155135
"""Parses command line arguments."""
156136

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
backoff==1.11.0
1+
backoff==1.11.1
22
pytest==6.2.4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
backoff==1.11.0
1+
backoff==1.11.1
22
flaky==3.7.0
33
pytest==6.2.4
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
backoff==1.11.0
1+
backoff==1.11.1
22
pytest==6.2.4
33
flaky==3.7.0
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
backoff==1.11.0
1+
backoff==1.11.1
22
google-cloud-storage==1.41.0
33
pytest==6.2.4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
backoff==1.11.0
1+
backoff==1.11.1
22
pytest==6.2.4
33
flaky==3.7.0

notebooks/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
google-cloud-storage==1.41.0
2-
google-cloud-bigquery[pandas,pyarrow]==2.23.2
2+
google-cloud-bigquery[pandas,pyarrow]==2.24.0
33
matplotlib==3.1.2; python_version > '3.0'
44
matplotlib==2.2.5; python_version < '3.0'
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Pillow==8.3.0
22
apache-beam[gcp]==2.30.0
33
google-cloud-aiplatform==1.1.1
4-
google-cloud-bigquery==2.23.1 # Indirect dependency, but there is a version conflict that causes pip to hang unless we constraint this.
4+
google-cloud-bigquery==2.24.0 # Indirect dependency, but there is a version conflict that causes pip to hang unless we constraint this.

run/idp-sql/requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Flask==2.0.1
2-
SQLAlchemy==1.4.19
2+
SQLAlchemy==1.4.22
33
pg8000==1.21.0
44
gunicorn==20.1.0
5-
firebase-admin==5.0.1
5+
firebase-admin==5.0.2
66
structlog==21.1.0
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pytest==6.2.4
22
mock==4.0.3
3-
backoff==1.11.0
3+
backoff==1.11.1

storage/s3-sdk/requirements-test.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
backoff==1.11.0
1+
backoff==1.11.1
22
pytest==6.2.4
33
google-cloud-storage==1.41.0

storage/s3-sdk/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
boto3==1.17.98
1+
boto3==1.18.22

trace/cloud-trace-demo-app-opentelemetry/app/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ opentelemetry-exporter-gcp-trace==1.0.0
44
opentelemetry-propagator-gcp==1.0.0
55
opentelemetry-instrumentation-flask==0.20b0
66
grpcio==1.39.0
7-
httpretty==1.1.3
7+
httpretty==1.1.4
88
google-cloud-monitoring==2.2.1
99
google-cloud-trace==0.24.0

trace/cloud-trace-demo-app/app/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ opencensus-ext-stackdriver==0.7.4
88
opencensus-ext-flask==0.7.5 # requires flask!=1.1.3, <2.0.0 and >=0.12.3
99
opencensus-context==0.1.2
1010
grpcio==1.39.0
11-
httpretty==1.1.3
11+
httpretty==1.1.4

0 commit comments

Comments
 (0)