chore(Dockerfile): add Python 3.9 by ace-n · Pull Request #4968 · GoogleCloudPlatform/python-docs-samples

3 changes: 2 additions & 1 deletion .kokoro/docker/Dockerfile

Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,6 +45,7 @@ RUN apt-get update \
		libffi-dev \
		liblzma-dev \
		libmagickwand-dev \
		libmemcached-dev \
		libpython3-dev \
		libreadline-dev \
		libsnappy-dev \
Expand Down Expand Up		@@ -103,7 +104,7 @@ RUN set -ex \
		&& export GNUPGHOME="$(mktemp -d)" \
		&& echo "disable-ipv6" >> "${GNUPGHOME}/dirmngr.conf" \
		&& /tmp/fetch_gpg_keys.sh \
		&& for PYTHON_VERSION in 2.7.18 3.6.10 3.7.7 3.8.3; do \
		&& for PYTHON_VERSION in 2.7.18 3.6.10 3.7.7 3.8.3 3.9.0; do \
ace-n marked this conversation as resolved. Show resolved Hide resolved
		wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
		&& wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
		&& gpg --batch --verify python-${PYTHON_VERSION}.tar.xz.asc python-${PYTHON_VERSION}.tar.xz \
Expand Down

6 changes: 5 additions & 1 deletion .kokoro/docker/fetch_gpg_keys.sh

Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,6 +44,10 @@ retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
		retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
		0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D

		# 3.8.0 (Łukasz Langa)
		# 3.8.0, 3.9.0 (Łukasz Langa)
		retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
		E3FF2839C048B25C084DEBE9B26995E310250568

		# 3.10.x and 3.11.x (Pablo Galindo Salgado)
		retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
		A035C8C19219BA821ECEA86B64E628F8D684696D

63 changes: 63 additions & 0 deletions .kokoro/python3.9/common.cfg

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,63 @@
		# 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-samples-testing-docker"
		}

		# 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_v2.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: "py-3.9"
ace-n marked this conversation as resolved. Show resolved Hide resolved
		}

		# Declare build specific Cloud project. It still uses the common one,
		# but we'll update the value once we have more Cloud projects.
		env_vars: {
		key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
		value: "python-docs-samples-tests-py39"
		}

		# Number of test workers.
		env_vars: {
		key: "NUM_TEST_WORKERS"
		value: "10"
		}

		env_vars: {
		key: "TRAMPOLINE_DOCKERFILE"
		value: ".kokoro/docker/Dockerfile"
		}

21 changes: 21 additions & 0 deletions .kokoro/python3.9/continuous.cfg

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,21 @@
		# 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: ".kokoro/tests/run_tests_diff_head.sh"
		}

32 changes: 32 additions & 0 deletions .kokoro/python3.9/periodic.cfg

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,32 @@
		# 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: ".kokoro/tests/run_tests.sh"
		}

		env_vars: {
		key: "REPORT_TO_BUILD_COP_BOT"
		value: "true"
		}

		# Tell Trampoline to upload the Docker image after successfull build.
		env_vars: {
		key: "TRAMPOLINE_IMAGE_UPLOAD"
		value: "true"
		}

21 changes: 21 additions & 0 deletions .kokoro/python3.9/presubmit.cfg

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,21 @@
		# 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: ".kokoro/tests/run_tests_diff_master.sh"
		}

2 changes: 1 addition & 1 deletion appengine/flexible/memcache/noxfile.py

Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,7 +22,7 @@

		# DO NOT EDIT - automatically generated.
		# All versions used to tested samples.
		ALL_VERSIONS = ["2.7", "3.6", "3.7", "3.8"]
		ALL_VERSIONS = ["2.7", "3.6", "3.7", "3.8", "3.9"]

		# Any default versions that should be ignored.
		IGNORED_VERSIONS = ["2.7", "3.8"]
Expand Down

4 changes: 2 additions & 2 deletions appengine/standard/noxfile-template.py

Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,10 +81,10 @@ def get_pytest_env_vars():

		# DO NOT EDIT - automatically generated.
		# All versions used to tested samples.
		ALL_VERSIONS = ["2.7", "3.6", "3.7", "3.8"]
		ALL_VERSIONS = ["2.7", "3.6", "3.7", "3.8", "3.9"]

		# Any default versions that should be ignored.
		IGNORED_VERSIONS = ["3.6", "3.7", "3.8"]
		IGNORED_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]

		TESTED_VERSIONS = sorted([v for v in ALL_VERSIONS if v not in IGNORED_VERSIONS])

Expand Down

39 changes: 39 additions & 0 deletions appengine/standard_python3/bigquery/noxfile_config.py

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,39 @@
		# Copyright 2021 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.

		# Default TEST_CONFIG_OVERRIDE for python repos.

		# You can copy this file into your directory, then it will be inported from
		# the noxfile.py.

		# The source of truth:
		# https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/noxfile_config.py

		TEST_CONFIG_OVERRIDE = {
		# You can opt out from the test for specific Python versions.
		# There's no google-cloud-bigquery package for Python 3.9.
		"ignored_versions": ["2.7", "3.9"],
		# Old samples are opted out of enforcing Python type hints
		# All new samples should feature them
		"enforce_type_hints": False,
		# An envvar key for determining the project id to use. Change it
		# to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a
		# build specific Cloud project. You can also use your own string
		# to use your own Cloud project.
		"gcloud_project_env": "GOOGLE_CLOUD_PROJECT",
		# 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
		# A dictionary you want to inject into your test. Don't put any
		# secrets here. These values will override predefined values.
		"envs": {},
		}

40 changes: 40 additions & 0 deletions appengine/standard_python3/cloud_debugger/noxfile_config.py

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,40 @@
		# Copyright 2021 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.

		# Default TEST_CONFIG_OVERRIDE for python repos.

		# You can copy this file into your directory, then it will be inported from
		# the noxfile.py.

		# The source of truth:
		# https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/noxfile_config.py

		TEST_CONFIG_OVERRIDE = {
		# You can opt out from the test for specific Python versions.
		# google-python-cloud-debugger doesn't support Python 3.9.
		# https://github.com/GoogleCloudPlatform/cloud-debug-python/issues/22
		"ignored_versions": ["2.7", "3.9"],
		# Old samples are opted out of enforcing Python type hints
		# All new samples should feature them
		"enforce_type_hints": False,
		# An envvar key for determining the project id to use. Change it
		# to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a
		# build specific Cloud project. You can also use your own string
		# to use your own Cloud project.
		"gcloud_project_env": "GOOGLE_CLOUD_PROJECT",
		# 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
		# A dictionary you want to inject into your test. Don't put any
		# secrets here. These values will override predefined values.
		"envs": {},
		}

39 changes: 39 additions & 0 deletions bigquery/bqml/noxfile_config.py

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,39 @@
		# Copyright 2021 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.

		# Default TEST_CONFIG_OVERRIDE for python repos.

		# You can copy this file into your directory, then it will be inported from
		# the noxfile.py.

		# The source of truth:
		# https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/noxfile_config.py

		TEST_CONFIG_OVERRIDE = {
		# You can opt out from the test for specific Python versions.
		# Skipping for Python 3.9 due to pyarrow compilation failure.
		"ignored_versions": ["2.7", "3.9"],
		# Old samples are opted out of enforcing Python type hints
		# All new samples should feature them
		"enforce_type_hints": False,
		# An envvar key for determining the project id to use. Change it
		# to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a
		# build specific Cloud project. You can also use your own string
		# to use your own Cloud project.
		"gcloud_project_env": "GOOGLE_CLOUD_PROJECT",
		# 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
		# A dictionary you want to inject into your test. Don't put any
		# secrets here. These values will override predefined values.
		"envs": {},
		}

39 changes: 39 additions & 0 deletions bigquery/datalab-migration/noxfile_config.py

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,39 @@
		# Copyright 2021 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.

		# Default TEST_CONFIG_OVERRIDE for python repos.

		# You can copy this file into your directory, then it will be inported from
		# the noxfile.py.

		# The source of truth:
		# https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/noxfile_config.py

		TEST_CONFIG_OVERRIDE = {
		# You can opt out from the test for specific Python versions.
		# Skipping for Python 3.9 due to pyarrow compilation failure.
		"ignored_versions": ["2.7", "3.9"],
		# Old samples are opted out of enforcing Python type hints
		# All new samples should feature them
		"enforce_type_hints": False,
		# An envvar key for determining the project id to use. Change it
		# to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a
		# build specific Cloud project. You can also use your own string
		# to use your own Cloud project.
		"gcloud_project_env": "GOOGLE_CLOUD_PROJECT",
		# 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
		# A dictionary you want to inject into your test. Don't put any
		# secrets here. These values will override predefined values.
		"envs": {},
		}

39 changes: 39 additions & 0 deletions bigquery/pandas-gbq-migration/noxfile_config.py

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,39 @@
		# Copyright 2021 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.

		# Default TEST_CONFIG_OVERRIDE for python repos.

		# You can copy this file into your directory, then it will be inported from
		# the noxfile.py.

		# The source of truth:
		# https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/noxfile_config.py

		TEST_CONFIG_OVERRIDE = {
		# You can opt out from the test for specific Python versions.
		# Skipping for Python 3.9 due to pyarrow compilation failure.
		"ignored_versions": ["2.7", "3.9"],
		# Old samples are opted out of enforcing Python type hints
		# All new samples should feature them
		"enforce_type_hints": False,
		# An envvar key for determining the project id to use. Change it
		# to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a
		# build specific Cloud project. You can also use your own string
		# to use your own Cloud project.
		"gcloud_project_env": "GOOGLE_CLOUD_PROJECT",
		# 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
		# A dictionary you want to inject into your test. Don't put any
		# secrets here. These values will override predefined values.
		"envs": {},
		}