Skip to content

Commit 3272d20

Browse files
czahediczahedi
authored
Merge branch 'master' into vision-v1p3beta1-logo-delet-old-beta-snippets
2 parents fef62a3 + efe5e78 commit 3272d20

File tree

368 files changed

+2792
-1152
lines changed

Some content is hidden

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

368 files changed

+2792
-1152
lines changed

‎.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/container_registry/ @DanSanche @GoogleCloudPlatform/python-samples-owners
2424
/datacatalog/ @shollyman @GoogleCloudPlatform/python-samples-owners
2525
/dataflow/ @davidcavazos @GoogleCloudPlatform/python-samples-owners
26-
/datalabeling/ @czahedi @GoogleCloudPlatform/python-samples-owners
26+
/datalabeling/ @sgreenberg @GoogleCloudPlatform/python-samples-owners
2727
/dataproc/ @bradmiro @GoogleCloudPlatform/python-samples-owners
2828
/datastore/ @andrewsg @GoogleCloudPlatform/python-samples-owners
2929
/dialogflow/ @nnegrey @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners

‎.github/blunderbuss.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
assign_issues:
22
- busunkim96
3-
- dmahugh
43
- kurtisvg
54
- leahecole
65
- gguuss
76
- crwilcox
87
assign_prs:
98
- busunkim96
10-
- dmahugh
119
- kurtisvg
1210
- leahecole
1311
- gguuss

‎.kokoro/python2.7/common.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ action {
4141
# Specify which tests to run
4242
env_vars: {
4343
key: "RUN_TESTS_SESSION"
44-
value: "py2"
44+
value: "py-2.7"
4545
}

‎.kokoro/python3.6/common.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ action {
4141
# Specify which tests to run
4242
env_vars: {
4343
key: "RUN_TESTS_SESSION"
44-
value: "py3-3.6"
44+
value: "py-3.6"
4545
}

‎.kokoro/python3.7/common.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ action {
4141
# Specify which tests to run
4242
env_vars: {
4343
key: "RUN_TESTS_SESSION"
44-
value: "py3-3.7"
44+
value: "py-3.7"
4545
}

‎.kokoro/python3.8/common.cfg

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Copyright 2019 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Format: //devtools/kokoro/config/proto/build.proto
16+
17+
timeout_mins: 300
18+
19+
# Configure the docker image for kokoro-trampoline.
20+
env_vars: {
21+
key: "TRAMPOLINE_IMAGE"
22+
value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
23+
}
24+
25+
# Download trampoline resources.
26+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
27+
28+
# Use the trampoline script to run in docker.
29+
build_file: "python-docs-samples/.kokoro/trampoline.sh"
30+
31+
# Download secrets from Cloud Storage.
32+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
33+
34+
# Copy results for Resultstore
35+
action {
36+
define_artifacts {
37+
regex: "**/*sponge_log.xml"
38+
}
39+
}
40+
41+
# Specify which tests to run
42+
env_vars: {
43+
key: "RUN_TESTS_SESSION"
44+
value: "py-3.8"
45+
}

‎.kokoro/python3.8/continuous.cfg

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright 2020 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Format: //devtools/kokoro/config/proto/build.proto
16+
17+
# Tell the trampoline which build file to use.
18+
env_vars: {
19+
key: "TRAMPOLINE_BUILD_FILE"
20+
value: "github/python-docs-samples/.kokoro/tests/run_tests.sh"
21+
}

‎.kokoro/python3.8/periodic.cfg

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright 2020 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Format: //devtools/kokoro/config/proto/build.proto
16+
17+
# Tell the trampoline which build file to use.
18+
env_vars: {
19+
key: "TRAMPOLINE_BUILD_FILE"
20+
value: "github/python-docs-samples/.kokoro/tests/run_tests.sh"
21+
}

‎.kokoro/python3.8/presubmit.cfg

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright 2019 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Format: //devtools/kokoro/config/proto/build.proto
16+
17+
# Tell the trampoline which build file to use.
18+
env_vars: {
19+
key: "TRAMPOLINE_BUILD_FILE"
20+
value: "github/python-docs-samples/.kokoro/tests/run_tests_only_diff.sh"
21+
}

‎.kokoro/tests/run_tests.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,13 @@ for file in **/requirements.txt; do
9292

9393
# If no local noxfile exists, copy the one from root
9494
if [[ ! -f "noxfile.py" ]]; then
95-
cp "$ROOT/noxfile-template.py" "./noxfile.py"
96-
echo -e "\n Using noxfile from project root. \n"
95+
PARENT_DIR=$(cd ../ && pwd)
96+
while [[ "$PARENT_DIR" != "$ROOT" && ! -f "$PARENT_DIR/noxfile-template.py" ]];
97+
do
98+
PARENT_DIR=$(dirname "$PARENT_DIR")
99+
done
100+
cp "$PARENT_DIR/noxfile-template.py" "./noxfile.py"
101+
echo -e "\n Using noxfile-template from parent folder ($PARENT_DIR). \n"
97102
fi
98103

99104
# Use nox to execute the tests for the project.

0 commit comments

Comments
 (0)