diff --git a/.kokoro/python3.5/common.cfg b/.kokoro/python3.5/common.cfg deleted file mode 100644 index 676a3970b8a7..000000000000 --- a/.kokoro/python3.5/common.cfg +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Format: //devtools/kokoro/config/proto/build.proto - -timeout_mins: 300 - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "python-docs-samples/.kokoro/trampoline.sh" - -# Download secrets from Cloud Storage. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples" - -# Copy results for Resultstore -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Specify which tests to run -env_vars: { - key: "RUN_TESTS_SESSION" - value: "py3-3.5" -} diff --git a/.kokoro/python3.5/continuous.cfg b/.kokoro/python3.5/continuous.cfg deleted file mode 100644 index 90879b0bec7e..000000000000 --- a/.kokoro/python3.5/continuous.cfg +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Format: //devtools/kokoro/config/proto/build.proto - -# Tell the trampoline which build file to use. -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/python-docs-samples/.kokoro/tests/run_tests.sh" -} diff --git a/.kokoro/python3.5/periodic.cfg b/.kokoro/python3.5/periodic.cfg deleted file mode 100644 index 90879b0bec7e..000000000000 --- a/.kokoro/python3.5/periodic.cfg +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Format: //devtools/kokoro/config/proto/build.proto - -# Tell the trampoline which build file to use. -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/python-docs-samples/.kokoro/tests/run_tests.sh" -} diff --git a/.kokoro/python3.5/presubmit.cfg b/.kokoro/python3.5/presubmit.cfg deleted file mode 100644 index e9c6e483b1c7..000000000000 --- a/.kokoro/python3.5/presubmit.cfg +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Format: //devtools/kokoro/config/proto/build.proto - -# Tell the trampoline which build file to use. -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/python-docs-samples/.kokoro/tests/run_tests_only_diff.sh" -} diff --git a/AUTHORING_GUIDE.md b/AUTHORING_GUIDE.md index 79ffe8545a02..41451603d107 100644 --- a/AUTHORING_GUIDE.md +++ b/AUTHORING_GUIDE.md @@ -19,8 +19,8 @@ No matter what, all samples must: 1. Be either a web application or a runnable console application. 1. Have a `requirements.txt` containing all of its third-party dependencies. All requirements must be pinned. -1. Work in Python 2.7, 3.5, 3.6, and 3.7. App Engine Standard is exempt as it - only supports 2.7. Our default version is currently Python 3.5. +1. Work in Python 2.7, 3.6, and 3.7. App Engine Standard is exempt as it + only supports 2.7. Our default version is currently Python 3.6. 1. Have tests. ## Style & linting diff --git a/noxfile-template.py b/noxfile-template.py index 4204daf27cad..c8248b060c8a 100644 --- a/noxfile-template.py +++ b/noxfile-template.py @@ -208,7 +208,7 @@ def py2(session, sample): _session_tests(session, sample) -@nox.session(python=["3.5", "3.6", "3.7"]) +@nox.session(python=["3.6", "3.7"]) @nox.parametrize("sample", NON_GAE_STANDARD_SAMPLES_PY3) def py3(session, sample): """Runs py.test for a sample using Python 3.x"""