Skip to content

Commit 00d8976

Browse files
authored
Merge branch 'main' into cicd_tutorial
2 parents 7414dc6 + 3341286 commit 00d8976

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1509
-166
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
/spanner/**/*.py @larkee @GoogleCloudPlatform/python-samples-owners
7272
/speech/**/*.py @telpirion @GoogleCloudPlatform/python-samples-owners
7373
/storage/**/*.py @GoogleCloudPlatform/cloud-storage-dpes @GoogleCloudPlatform/python-samples-owners
74+
/storagetransfer/**/*.py @GoogleCloudPlatform/cloud-storage-dpes @GoogleCloudPlatform/python-samples-owners
7475
/tables/automl/**/*.py @telpirion @GoogleCloudPlatform/python-samples-owners
7576
/tasks/**/*.py @averikitsch @GoogleCloudPlatform/python-samples-owners
7677
/texttospeech/**/*.py @telpirion @GoogleCloudPlatform/python-samples-owners

.kokoro/tests/run_tests.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@ fi
9696
source ./testing/test-env.sh
9797
export GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/testing/service-account.json
9898

99+
# Import secrets for AWS integration testing. This can be used for products
100+
# such as Storage Transfer Service.
101+
if [[ -f "${KOKORO_GFILE_DIR}/aws-secrets.sh" ]]; then
102+
source "${KOKORO_GFILE_DIR}/aws-secrets.sh"
103+
fi
104+
99105
# For cloud-run session, we activate the service account for gcloud sdk.
100106
gcloud auth activate-service-account \
101107
--key-file "${GOOGLE_APPLICATION_CREDENTIALS}"

appengine/standard_python3/cloud_debugger/noxfile_config.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222

2323
TEST_CONFIG_OVERRIDE = {
2424
# You can opt out from the test for specific Python versions.
25-
# google-python-cloud-debugger doesn't support Python 3.9.
26-
# https://github.com/GoogleCloudPlatform/cloud-debug-python/issues/22
27-
"ignored_versions": ["2.7", "3.9"],
25+
"ignored_versions": ["2.7", "3.10"],
2826
# Old samples are opted out of enforcing Python type hints
2927
# All new samples should feature them
3028
"enforce_type_hints": False,

cloud-sql/mysql/client-side-encryption/noxfile_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
TEST_CONFIG_OVERRIDE = {
2424
# You can opt out from the test for specific Python versions.
25-
"ignored_versions": ["2.7", "3.6"],
25+
"ignored_versions": ["2.7", "3.6", "3.10"],
2626
# Old samples are opted out of enforcing Python type hints
2727
# All new samples should feature them
2828
"enforce_type_hints": True,

cloud-sql/postgres/client-side-encryption/noxfile_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
TEST_CONFIG_OVERRIDE = {
2424
# You can opt out from the test for specific Python versions.
25-
"ignored_versions": ["2.7", "3.6"],
25+
"ignored_versions": ["2.7", "3.6", "3.10"],
2626
# Old samples are opted out of enforcing Python type hints
2727
# All new samples should feature them
2828
"enforce_type_hints": True,

cloud-sql/sql-server/client-side-encryption/noxfile_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
TEST_CONFIG_OVERRIDE = {
2424
# You can opt out from the test for specific Python versions.
25-
"ignored_versions": ["2.7", "3.6"],
25+
"ignored_versions": ["2.7", "3.6", "3.10"],
2626
# Old samples are opted out of enforcing Python type hints
2727
# All new samples should feature them
28-
"enforce_type_hints": True,
28+
"enforce_type_hints": False,
2929
# An envvar key for determining the project id to use. Change it
3030
# to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a
3131
# build specific Cloud project. You can also use your own string
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Flask==2.0.2
22
gunicorn==20.0.4; python_version > '3.0'
33
gunicorn==19.10.0; python_version < '3.0'
4-
google-cloud-vision==2.6.2
4+
google-cloud-vision==2.6.3
55
google-cloud-storage==1.43.0
66
google-cloud-datastore==2.4.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
google-api-python-client==2.33.0
22
google-cloud-storage==1.43.0
3-
pytest-xdist==2.4.0
3+
pytest-xdist==2.5.0
44
pytest==6.2.4
55
pyyaml==6.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
google-cloud-vision==2.6.2
1+
google-cloud-vision==2.6.3
22
google-cloud-storage==1.43.0
33
Wand==0.6.7

functions/ocr/app/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
google-cloud-pubsub==2.9.0
22
google-cloud-storage==1.43.0
33
google-cloud-translate==3.6.1
4-
google-cloud-vision==2.6.2
4+
google-cloud-vision==2.6.3

0 commit comments

Comments
 (0)