8000 Merge branch 'master' into split_memorystore_fixtures · code4ward/python-docs-samples@88af757 · GitHub
[go: up one dir, main page]
Skip to content

Commit 88af757

Browse files
leahecoleleahecole
authored
Merge branch 'master' into split_memorystore_fixtures
2 parents aced31b + 0d78724 commit 88af757

File tree

21 files changed

+132
-25
lines changed

21 files changed

+132
-25
lines changed

‎.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/codelabs/**/*.py @GoogleCloudPlatform/python-samples-owners
2323
/composer/**/*.py @leahecole @GoogleCloudPlatform/python-samples-owners
2424
/compute/**/*.py @GoogleCloudPlatform/python-samples-owners
25-
/container_registry/**/*.py @donmccasland @GoogleCloudPlatform/python-samples-owners
25+
/container_registry/**/*.py @donmccasland @dinagraves @kelsk @GoogleCloudPlatform/python-samples-owners
2626
/data-science-onramp/ @coleleah @bradmiro @GoogleCloudPlatform/python-samples-owners
2727
/datacatalog/**/*.py @shollyman @GoogleCloudPlatform/python-samples-owners
2828
/dataflow/**/*.py @davidcavazos @GoogleCloudPlatform/python-samples-owners
@@ -35,7 +35,7 @@
3535
/endpoints/**/*.py @GoogleCloudPlatform/python-samples-owners
3636
/error_reporting/**/*.py @GoogleCloudPlatform/python-samples-owners
3737
/firestore/**/*.py @GoogleCloudPlatform/firestore-dpe @GoogleCloudPlatform/python-samples-owners
38-
/functions/**/*.py @ace-n @GoogleCloudPlatform/python-samples-owners
38+
/functions/**/*.py @ace-n @grant @GoogleCloudPlatform/python-samples-owners
3939
/healthcare/**/*.py @noerog @GoogleCloudPlatform/python-samples-owners
4040
/iam/**/*.py @melaniedejong @GoogleCloudPlatform/python-samples-owners
4141
/iap/**/*.py @GoogleCloudPlatform/python-samples-owners
@@ -50,7 +50,7 @@
5050
/monitoring/**/*.py @GoogleCloudPlatform/python-samples-owners
5151
/notebooks/**/*.py @alixhami @sirtorry @GoogleCloudPlatform/python-samples-owners
5252
/opencensus/**/*.py @GoogleCloudPlatform/python-samples-owners
53-
/profiler/**/*.py @jqll @GoogleCloudPlatform/python-samples-owners
53+
/profiler/**/*.py @kalyanac @GoogleCloudPlatform/python-samples-owners
5454
/pubsub/**/*.py @anguillanneuf @hongalex @GoogleCloudPlatform/python-samples-owners
5555
/run/**/*.py @averikitsch @grant @GoogleCloudPlatform/python-samples-owners
5656
/scheduler/**/*.py @averikitsch @GoogleCloudPlatform/python-samples-owners

‎.github/blunderbuss.yml

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,116 @@ assign_issues_by:
55
- engelke
66
- labels:
77
- 'api: automl'
8+
- 'api: dialogflow'
9+
- 'api: language'
10+
- 'api: speech'
11+
- 'api: texttospeech'
12+
- 'api: translate'
13+
- 'api: video'
14+
- 'api: vision'
815
to:
916
- sirtorry
1017
- telpirion
1118
- labels:
1219
- 'api: bigquery'
20+
- 'api: datacatalog'
1321
to:
1422
- shollyman
1523
- labels:
1624
- 'api: bigtable'
1725
to:
1826
- billyjacobson
27+
- labels:
28+
- 'api: billingbudgets'
29+
to:
30+
- GoogleCloudPlatform/billing-samples-maintainers
31+
- labels:
32+
- 'api: cloudsql'
33+
to:
34+
- GoogleCloudPlatform/cloud-sql-dpes
35+
- labels:
36+
- 'api: containeranalysis'
37+
to:
38+
- donmccasland
39+
- dinagraves
40+
- kelsk
41+
- labels:
42+
- 'api: datalabeling'
43+
- 'api: iot'
44+
to:
45+
- sgreenberg
46+
- labels:
47+
- 'api: dataproc'
48+
to:
49+
- bradmiro
50+
- labels:
51+
- 'api: datastore'
52+
- 'api: firestore'
53+
to:
54+
- GoogleCloudPlatform/firestore-dpe
55+
- labels:
56+
- 'api: dns'
57+
to:
58+
- michaelawyu
59+
- labels:
60+
- 'api: functions'
61+
to:
62+
- ace-n
63+
- grant
64+
- labels:
65+
- 'api: healthcare'
66+
to:
67+
- noerog
68+
- labels:
69+
- 'api: iam'
70+
to:
71+
- melaniedejong
72+
- labels:
73+
- 'api: logging'
74+
to:
75+
- simonz130
76+
- labels:
77+
- 'api: ml'
78+
to:
79+
- alecglassford
80+
- labels:
81+
- 'api: notebooks'
82+
to:
83+
- sirtorry
84+
- labels:
85+
- 'api: cloudprofiler'
86+
to:
87+
- kalyanac
88+
- labels:
89+
- 'api: pubsub'
90+
to:
91+
- anguillanneuf
92+
- labels:
93+
- 'api: run'
94+
to:
95+
- averikitsch
96+
- grant
97+
- labels:
98+
- 'api: cloudscheduler'
99+
- 'api: cloudtasks'
100+
- 'api: tasks'
101+
to:
102+
- averikitsch
103+
- labels:
104+
- 'api: spanner'
105+
to:
106+
- larkee
107+
- labels:
108+
- 'api: storage'
109+
to:
110+
- GoogleCloudPlatform/storage-dpe
111+
- labels:
112+
- 'api: cloudtrace'
113+
- 'api: trace'
114+
to:
115+
- dukeng
116+
- ziweizhao
117+
19118

20119
assign_issues:
21120
- busunkim96

‎.kokoro/tests/run_tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ test_prog="${PROJECT_ROOT}/.kokoro/tests/run_single_test.sh"
146146

147147
btlr_args=(
148148
"run"
149+
"--max-cmd-duration=30m"
149150
"**/requirements.txt"
150151
)
151152

‎appengine/flexible/analytics/requirements-test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pytest==6.0.1
2-
responses==0.11.0
2+
responses==0.12.0

‎appengine/flexible/mailgun/requirements-test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pytest==6.0.1
2-
responses==0.11.0
2+
responses==0.12.0

‎appengine/flexible/mailjet/requirements-test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pytest==6.0.1
2-
responses==0.11.0
2+
responses==0.12.0

‎appengine/flexible/twilio/requirements-test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pytest==6.0.1
2-
responses==0.11.0
2+
responses==0.12.0

‎appengine/standard/analytics/requirements-test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pytest==4.6.11; python_version < '3.0'
2-
responses==0.11.0
2+
responses==0.12.0

‎appengine/standard/firebase/firenotes/backend/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Flask==1.1.2
22
pyjwt==1.7.1
3-
flask-cors==3.0.8
3+
flask-cors==3.0.9
44
google-auth==1.21.0
55
requests==2.24.0
66
requests-toolbelt==0.9.1

‎appengine/standard/mailjet/requirements-test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pytest==4.6.11; python_version < '3.0'
2-
responses==0.11.0
2+
responses==0.12.0

‎appengine/standard_python3/django/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Django==3.1
1+
Django==3.1.1
22
PyMySQL==0.10.0

‎composer/workflows/hadoop_tutorial.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@
103103
create_dataproc_cluster >> run_dataproc_hadoop >> delete_dataproc_cluster
104104
# [END composer_hadoop_steps]
105105

106-
# [END composer_hadoop]
106+
# [END composer_hadoop_tutorial]

‎datastore/cloud-ndb/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# [START ndb_version]
2-
google-cloud-ndb==1.5.0
2+
google-cloud-ndb==1.5.1
33
# [END ndb_version]
44
flask==1.1.2

‎endpoints/getting-started/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Flask==1.1.2
2-
flask-cors==3.0.8
2+
flask-cors==3.0.9
33
gunicorn==20.0.4
44
six==1.15.0
55
pyyaml==5.3.1

‎functions/concepts/requirements-test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ flask==1.1.2
22
mock==4.0.2
33
pytest==6.0.1
44
requests==2.24.0
5-
responses==0.11.0
5+
responses==0.12.0

‎functions/helloworld/main.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ def hello_http(request):
4242
"""HTTP Cloud Function.
4343
Args:
4444
request (flask.Request): The request object.
45-
<http://flask.pocoo.org/docs/1.0/api/#flask.Request>
45+
<https://flask.palletsprojects.com/en/1.1.x/api/#incoming-request-data>
4646
Returns:
4747
The response text, or any set of values that can be turned into a
4848
Response object using `make_response`
49-
<http://flask.pocoo.org/docs/1.0/api/#flask.Flask.make_response>.
49+
<https://flask.palletsprojects.com/en/1.1.x/api/#flask.make_response>.
5050
"""
5151
request_json = request.get_json(silent=True)
5252
request_args = request.args
@@ -116,11 +116,11 @@ def hello_content(request):
116116
according to the "content-type" header.
117117
Args:
118118
request (flask.Request): The request object.
119-
<http://flask.pocoo.org/docs/1.0/api/#flask.Request>
119+
<https://flask.palletsprojects.com/en/1.1.x/api/#incoming-request-data>
120120
Returns:
121121
The response text, or any set of values that can be turned into a
122122
Response object using `make_response`
123-
<http://flask.pocoo.org/docs/1.0/api/#flask.Flask.make_response>.
123+
<https://flask.palletsprojects.com/en/1.1.x/api/#flask.make_response>.
124124
"""
125125
content_type = request.headers['content-type']
126126
if content_type == 'application/json':
@@ -146,11 +146,11 @@ def hello_method(request):
146146
""" Responds to a GET request with "Hello world!". Forbids a PUT request.
147147
Args:
148148
request (flask.Request): The request object.
149-
<http://flask.pocoo.org/docs/1.0/api/#flask.Request>
149+
<https://flask.palletsprojects.com/en/1.1.x/api/#incoming-request-data>
150150
Returns:
151151
The response text, or any set of values that can be turned into a
152-
Response object using `make_response`
153-
<http://flask.pocoo.org/docs/1.0/api/#flask.Flask.make_response>.
152+
Response object using `make_response`
153+
<https://flask.palletsprojects.com/en/1.1.x/api/#flask.make_response>.
154154
"""
155155
from flask import abort
156156

‎functions/tips/requirements-test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
flask==1.1.2
22
pytest==6.0.1
33
requests==2.24.0
4-
responses==0.11.0
4+
responses==0.12.0

‎iap/iap_test.py

Lines changed: 7 additions & 0 deletions
< 10000 td data-grid-cell-id="diff-91362150cefd6b07e3f5ca93b350fd43adc0f6940ee62bada976b33cd263e4f4-15-15-0" data-selected="false" role="gridcell" style="background-color:var(--bgColor-default);text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative diff-line-number-neutral left-side">15
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
15
"""Test script for Identity-Aware Proxy code samples."""
1616

1717
import os
18+
import time
1819

1920
import pytest
2021

@@ -55,6 +56,12 @@ def test_main(capsys):
5556
expected_audience = '/projects/{}/apps/{}'.format(
5657
IAP_PROJECT_NUMBER, IAP_APP_ID)
5758

59+
# We see occational test failures when the system clock in our
60+
# test VMs is incorrect. Sleeping 30 seconds to avoid the failure.
61+
# https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4467
62+
63+
time.sleep(30)
64+
5865
jwt_validation_result = validate_jwt.validate_iap_jwt(
5966
iap_jwt, expected_audience)
6067

‎storage/s3-sdk/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
boto3==1.14.50
1+
boto3==1.14.52

‎testing/btlr

-3.29 MB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ opentelemetry-sdk==0.9b0
1111
grpcio==1.31.0
1212
httpretty==1.0.2
1313
google-cloud-monitoring==1.1.0
14-
google-cloud-trace==0.23.0
14+
google-cloud-trace==0.24.0
1515

0 commit comments

Comments
 (0)
0