Skip to content

Commit 62354a2

Browse files
nnegreynnegrey
authored
Merge branch 'master' into speech-continuous
2 parents b25330a + 78a7a2d commit 62354a2

File tree

807 files changed

+39681
-5483
lines changed

Some content is hidden

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

807 files changed

+39681
-5483
lines changed

‎.github/CODEOWNERS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Code owners file.
2+
# This file controls who is tagged for review for any given pull request.
3+
4+
# Alix Hamilton is the primary maintainer of the BigQuery samples.
5+
bigquery/* @alixhami
6+
7+
# Tim Swast is the primary maintainer of the BigQuery Data Transfer samples.
8+
bigquery/transfer/* @tswast
9+
10+
# Tim Swast is the primary maintainer of the Composer samples.
11+
composer/* @tswast

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ junit.xml
2121
credentials.dat
2222
.nox
2323
.vscode/
24-
*sponge_log.xml
24+
*sponge_log.xml
25+
.DS_store

‎.kokoro/common.cfg

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,17 @@ build_file: "python-docs-samples/.kokoro/trampoline.sh"
99
# Use the Python worker docker image.
1010
env_vars: {
1111
key: "TRAMPOLINE_IMAGE"
12-
value: "gcr.io/cloud-devrel-kokoro-resources/python"
12+
value: "gcr.io/cloud-devrel-kokoro-resources/python@sha256:4b6ba8c199e96248980db4538065cddeea594138b9b9fb2d0388603922087747"
13+
}
14+
15+
# Specify project ID
16+
env_vars: {
17+
key: "GCP_PROJECT"
18+
value: "python-docs-samples"
1319
}
1420

1521
action {
1622
define_artifacts {
1723
regex: "**/*sponge_log.xml"
1824
}
19-
}
25+
}

‎.kokoro/presubmit_tests_composer.cfg

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,13 @@ env_vars: {
1111

1212
env_vars: {
1313
key: "NOX_SESSION"
14-
value: "composer and py27 and not appengine"
14+
value: "composer and py36 and not appengine"
15+
}
16+
17+
# Explicitly use choose unicode dependency to let the apache-airflow package
18+
# installation continue. See:
19+
# https://github.com/apache/incubator-airflow/pull/3660
20+
env_vars: {
21+
key: "SLUGIFY_USES_TEXT_UNIDECODE"
22+
value: "yes"
1523
}

‎.kokoro/presubmit_tests_testing.cfg renamed to ‎.kokoro/presubmit_tests_dlp.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ env_vars: {
1111

1212
env_vars: {
1313
key: "NOX_SESSION"
14-
value: "testing and py36 and not appengine"
14+
value: "dlp and py36 and not appengine"
1515
}

‎.kokoro/presubmit_tests_functions.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Download secrets from Cloud Storage.
4+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
5+
6+
# Tell the trampoline which build file to use.
7+
env_vars: {
8+
key: "TRAMPOLINE_BUILD_FILE"
9+
value: "github/python-docs-samples/.kokoro/system_tests.sh"
10+
}
11+
12+
env_vars: {
13+
key: "NOX_SESSION"
14+
value: "functions and (py36 or lint) and not venv"
15+
}

‎.kokoro/presubmit_tests_functions_sql.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Download secrets from Cloud Storage.
4+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
5+
6+
# Tell the trampoline which build file to use.
7+
env_vars: {
8+
key: "TRAMPOLINE_BUILD_FILE"
9+
value: "github/python-docs-samples/.kokoro/system_tests.sh"
10+
}
11+
12+
env_vars: {
13+
key: "NOX_SESSION"
14+
value: "functions and sql and py36 and not venv"
15+
}

‎.kokoro/system_tests_testing.cfg renamed to ‎.kokoro/presubmit_tests_tasks.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ env_vars: {
1111

1212
env_vars: {
1313
key: "NOX_SESSION"
14-
value: "testing and py36 and not appengine"
14+
value: "tasks and py36 and not appengine"
1515
}

‎.kokoro/system_tests.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,19 @@ source ./testing/test-env.sh
2626
export GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/testing/service-account.json
2727
export GOOGLE_CLIENT_SECRETS=$(pwd)/testing/client-secrets.json
2828

29+
# Run Cloud SQL proxy, if required
30+
if [ -n "${CLOUD_SQL_PROXY}" ]; then
31+
cloud_sql_proxy -instances="${MYSQL_INSTANCE}"=tcp:3306 &
32+
cloud_sql_proxy -instances="${POSTGRES_INSTANCE}"=tcp:5432 &
33+
fi
34+
2935
# Run tests
3036
nox -k "${NOX_SESSION}" || ret_code=$?
3137

38+
if [ -n "${CLOUD_SQL_PROXY}" ]; then
39+
killall cloud_sql_proxy || true
40+
fi
41+
3242
# Workaround for Kokoro permissions issue: delete secrets
3343
rm testing/{test-env.sh,client-secrets.json,service-account.json}
3444

‎.kokoro/system_tests_dlp.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Download secrets from Cloud Storage.
4+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
5+
6+
# Tell the trampoline which build file to use.
7+
env_vars: {
8+
key: "TRAMPOLINE_BUILD_FILE"
9+
value: "github/python-docs-samples/.kokoro/system_tests.sh"
10+
}
11+
12+
env_vars: {
13+
key: "NOX_SESSION"
14+
value: "dlp and py36 and not appengine"
15+
}

0 commit comments

Comments
 (0)