diff --git a/.kokoro/docker/Dockerfile b/.kokoro/docker/Dockerfile index e21de1fb8bc..66108382808 100644 --- a/.kokoro/docker/Dockerfile +++ b/.kokoro/docker/Dockerfile @@ -117,7 +117,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.7.16 3.8.16 3.9.16 3.10.9 3.11.1; do \ + && for PYTHON_VERSION in 2.7.18 3.7.12 3.8.13 3.9.13 3.10.5 3.11.1; do \ 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 \ diff --git a/.kokoro/python3.11/common.cfg b/.kokoro/python3.11/common.cfg deleted file mode 100644 index e61af80cb5a..00000000000 --- a/.kokoro/python3.11/common.cfg +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2023 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" - -# Access btlr binaries used in the tests -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/btlr" - -# 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.11" -} - -# 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-311" -} - -# Number of test workers. -env_vars: { - key: "NUM_TEST_WORKERS" - value: "10" -} - -env_vars: { - key: "TRAMPOLINE_DOCKERFILE" - value: ".kokoro/docker/Dockerfile" -} diff --git a/.kokoro/python3.11/continuous.cfg b/.kokoro/python3.11/continuous.cfg deleted file mode 100644 index 0bd041dd16a..00000000000 --- a/.kokoro/python3.11/continuous.cfg +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2023 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" -} diff --git a/.kokoro/python3.11/periodic.cfg b/.kokoro/python3.11/periodic.cfg deleted file mode 100644 index 402c3308caa..00000000000 --- a/.kokoro/python3.11/periodic.cfg +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2023 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" -} diff --git a/.kokoro/python3.11/presubmit.cfg b/.kokoro/python3.11/presubmit.cfg deleted file mode 100644 index e2b31b88480..00000000000 --- a/.kokoro/python3.11/presubmit.cfg +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2023 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_main.sh" -} diff --git a/MAC_SETUP.md b/MAC_SETUP.md index 026b7de4cb2..90d22d6314a 100644 --- a/MAC_SETUP.md +++ b/MAC_SETUP.md @@ -76,25 +76,21 @@ test their code. ```console $ pyenv install 3.6.13 ``` - * 3.7.16 (latest 3.7.x release) + * 3.7.13 (latest 3.7.x release) ```console - $ pyenv install 3.7.16 + $ pyenv install 3.7.13 ``` - * 3.8.16 (latest 3.8.x release) + * 3.8.13 (latest 3.8.x release) ```console - $ pyenv install 3.8.16 + $ pyenv install 3.8.13 ``` - * 3.9.16 (latest 3.9.x release) + * 3.9.12 (latest 3.9.x release) ```console - $ pyenv install 3.9.16 + $ pyenv install 3.9.12 ``` - * 3.10.9 (latest 3.10.x release) + * 3.10.4 (latest 3.10.x release) ```console - $ pyenv install 3.10.9 - ``` - * 3.11.1 (latest 3.11.x release) - ```console - $ pyenv install 3.11.1 + $ pyenv install 3.10.4 ``` > ℹ️ *Note*: If you are using an M1 Mac, diff --git a/README.md b/README.md index 25f5bcadca9..5ff9a3ef389 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Python samples for [Google Cloud Platform products][cloud]. -[![Build Status][py-2.7-shield]][py-2.7-link] [![Build Status][py-3.7-shield]][py-3.7-link] [![Build Status][py-3.8-shield]][py-3.8-link] [![Build Status][py-3.9-shield]][py-3.9-link] [![Build Status][py-3.10-shield]][py-3.10-link] [![Build Status][py-3.11-shield]][py-3.11-link] +[![Build Status][py-2.7-shield]][py-2.7-link] [![Build Status][py-3.7-shield]][py-3.7-link] [![Build Status][py-3.8-shield]][py-3.8-link] [![Build Status][py-3.9-shield]][py-3.9-link] [![Build Status][py-3.10-shield]][py-3.10-link] ## Google Cloud Samples @@ -77,5 +77,3 @@ Contributions welcome! See the [Contributing Guide](CONTRIBUTING.md). [py-3.9-link]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.9.html [py-3.10-shield]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-310.svg [py-3.10-link]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.10.html -[py-3.11-shield]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-311.svg -[py-3.11-link]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.11.html diff --git a/appengine/flexible/django_cloudsql/requirements.txt b/appengine/flexible/django_cloudsql/requirements.txt index e1d759f2818..eb5c5943ba7 100644 --- a/appengine/flexible/django_cloudsql/requirements.txt +++ b/appengine/flexible/django_cloudsql/requirements.txt @@ -1,7 +1,7 @@ Django==4.0.4; python_version >= '3.8' Django==3.2.14; python_version < '3.8' gunicorn==20.1.0 -psycopg2-binary==2.9.5 +psycopg2-binary==2.9.4 django-environ==0.9.0 google-cloud-secret-manager==2.12.0 django-storages[google]==1.13 diff --git a/appengine/flexible/scipy/noxfile_config.py b/appengine/flexible/scipy/noxfile_config.py index 3228fb0bf80..3973be68054 100644 --- a/appengine/flexible/scipy/noxfile_config.py +++ b/appengine/flexible/scipy/noxfile_config.py @@ -22,7 +22,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7", "3.6", "3.11"], + "ignored_versions": ["2.7", "3.6"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/appengine/flexible/scipy/requirements.txt b/appengine/flexible/scipy/requirements.txt index aa57c4cd1d0..92f0edb8d71 100644 --- a/appengine/flexible/scipy/requirements.txt +++ b/appengine/flexible/scipy/requirements.txt @@ -5,5 +5,5 @@ imageio==2.14.0 numpy==1.22.0; python_version > "3.7" numpy==1.21.4; python_version <= "3.7" pillow==9.2.0 -scipy==1.10.0; python_version > "3.7" +scipy==1.8.0; python_version > "3.7" scipy==1.7.3; python_version <= "3.7" diff --git a/appengine/standard/noxfile-template.py b/appengine/standard/noxfile-template.py index 6b5be424c65..01756181d8e 100644 --- a/appengine/standard/noxfile-template.py +++ b/appengine/standard/noxfile-template.py @@ -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", "3.9", "3.10", "3.11"] +ALL_VERSIONS = ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10"] # Any default versions that should be ignored. -IGNORED_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] +IGNORED_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10"] TESTED_VERSIONS = sorted([v for v in ALL_VERSIONS if v not in IGNORED_VERSIONS]) diff --git a/appengine/standard_python3/bigquery/noxfile_config.py b/appengine/standard_python3/bigquery/noxfile_config.py index 3428b4ef27a..58a33dea032 100644 --- a/appengine/standard_python3/bigquery/noxfile_config.py +++ b/appengine/standard_python3/bigquery/noxfile_config.py @@ -23,7 +23,7 @@ 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.6", "3.9", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.9"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/appengine/standard_python3/cloud_debugger/noxfile_config.py b/appengine/standard_python3/cloud_debugger/noxfile_config.py index 43a5796d194..f1e9239dbf2 100644 --- a/appengine/standard_python3/cloud_debugger/noxfile_config.py +++ b/appengine/standard_python3/cloud_debugger/noxfile_config.py @@ -22,7 +22,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7", "3.6", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/appengine/standard_python3/cloudsql/requirements.txt b/appengine/standard_python3/cloudsql/requirements.txt index 82fa64b498d..5096fa898c3 100644 --- a/appengine/standard_python3/cloudsql/requirements.txt +++ b/appengine/standard_python3/cloudsql/requirements.txt @@ -1,5 +1,5 @@ flask==2.1.0 # psycopg2==2.8.4 -psycopg2-binary==2.9.5 # you will need either the binary or the regular - for more info see http://initd.org/psycopg/docs/install.html +psycopg2-binary==2.9.4 # you will need either the binary or the regular - for more info see http://initd.org/psycopg/docs/install.html PyMySQL==1.0.2 SQLAlchemy==1.4.38 diff --git a/appengine/standard_python3/django/requirements.txt b/appengine/standard_python3/django/requirements.txt index 5702745a6d4..c043efc62da 100644 --- a/appengine/standard_python3/django/requirements.txt +++ b/appengine/standard_python3/django/requirements.txt @@ -1,5 +1,5 @@ Django==4.0.4; python_version >= '3.8' Django==3.2.14; python_version < '3.8' django-environ==0.9.0 -psycopg2-binary==2.9.5 +psycopg2-binary==2.9.4 google-cloud-secret-manager==2.12.0 diff --git a/bigquery/bqml/noxfile_config.py b/bigquery/bqml/noxfile_config.py index 4e2c703470f..f3574c250c5 100644 --- a/bigquery/bqml/noxfile_config.py +++ b/bigquery/bqml/noxfile_config.py @@ -23,7 +23,7 @@ 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.6", "3.9", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.9"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/bigquery/datalab-migration/noxfile_config.py b/bigquery/datalab-migration/noxfile_config.py index dedcffb884f..1010a0bf2ae 100644 --- a/bigquery/datalab-migration/noxfile_config.py +++ b/bigquery/datalab-migration/noxfile_config.py @@ -23,7 +23,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. # Skipping 3.6 and 3.7 to avoid needing a vulnerable version of IPython - "ignored_versions": ["2.7", "3.6", "3.7", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/bigquery/pandas-gbq-migration/noxfile_config.py b/bigquery/pandas-gbq-migration/noxfile_config.py index 4e2c703470f..f3574c250c5 100644 --- a/bigquery/pandas-gbq-migration/noxfile_config.py +++ b/bigquery/pandas-gbq-migration/noxfile_config.py @@ -23,7 +23,7 @@ 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.6", "3.9", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.9"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/cloud-sql/mysql/client-side-encryption/noxfile_config.py b/cloud-sql/mysql/client-side-encryption/noxfile_config.py index 67016bd9634..ebd83be7a20 100644 --- a/cloud-sql/mysql/client-side-encryption/noxfile_config.py +++ b/cloud-sql/mysql/client-side-encryption/noxfile_config.py @@ -22,7 +22,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7", "3.6", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/cloud-sql/postgres/client-side-encryption/noxfile_config.py b/cloud-sql/postgres/client-side-encryption/noxfile_config.py index 67016bd9634..ebd83be7a20 100644 --- a/cloud-sql/postgres/client-side-encryption/noxfile_config.py +++ b/cloud-sql/postgres/client-side-encryption/noxfile_config.py @@ -22,7 +22,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7", "3.6", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/cloud-sql/sql-server/client-side-encryption/noxfile_config.py b/cloud-sql/sql-server/client-side-encryption/noxfile_config.py index 692cb4ecd26..dab8523bc72 100644 --- a/cloud-sql/sql-server/client-side-encryption/noxfile_config.py +++ b/cloud-sql/sql-server/client-side-encryption/noxfile_config.py @@ -22,7 +22,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7", "3.6", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/composer/2022_airflow_summit/constraints.txt b/composer/2022_airflow_summit/constraints.txt index 4d810fc1a63..938384b6c06 100644 --- a/composer/2022_airflow_summit/constraints.txt +++ b/composer/2022_airflow_summit/constraints.txt @@ -427,7 +427,7 @@ prompt-toolkit==3.0.30 proto-plus==1.19.6 protobuf==3.20.0 psutil==5.9.1 -psycopg2-binary==2.9.5 +psycopg2-binary==2.9.3 ptyprocess==0.7.0 pure-eval==0.2.2 pure-sasl==0.6.2 diff --git a/composer/2022_airflow_summit/noxfile_config.py b/composer/2022_airflow_summit/noxfile_config.py index 9eadce0eccd..6fa0836abfc 100644 --- a/composer/2022_airflow_summit/noxfile_config.py +++ b/composer/2022_airflow_summit/noxfile_config.py @@ -30,7 +30,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - 'ignored_versions': ["2.7", "3.6", "3.7", "3.9", "3.10", "3.11"], # Composer w/ Airflow 2 only supports Python 3.8 + 'ignored_versions': ["2.7", "3.6", "3.7", "3.9", "3.10"], # Composer w/ Airflow 2 only supports Python 3.8 # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/composer/airflow_1_samples/noxfile_config.py b/composer/airflow_1_samples/noxfile_config.py index db38b805acf..ecec9f2ca05 100644 --- a/composer/airflow_1_samples/noxfile_config.py +++ b/composer/airflow_1_samples/noxfile_config.py @@ -31,7 +31,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. # Skipping for Python 3.9 due to numpy compilation failure. - "ignored_versions": ["2.7", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/composer/blog/gcp-tech-blog/data-orchestration-with-composer/constraints.txt b/composer/blog/gcp-tech-blog/data-orchestration-with-composer/constraints.txt index 4d810fc1a63..938384b6c06 100644 --- a/composer/blog/gcp-tech-blog/data-orchestration-with-composer/constraints.txt +++ b/composer/blog/gcp-tech-blog/data-orchestration-with-composer/constraints.txt @@ -427,7 +427,7 @@ prompt-toolkit==3.0.30 proto-plus==1.19.6 protobuf==3.20.0 psutil==5.9.1 -psycopg2-binary==2.9.5 +psycopg2-binary==2.9.3 ptyprocess==0.7.0 pure-eval==0.2.2 pure-sasl==0.6.2 diff --git a/composer/blog/gcp-tech-blog/data-orchestration-with-composer/noxfile_config.py b/composer/blog/gcp-tech-blog/data-orchestration-with-composer/noxfile_config.py index 58ce78689ca..afa6026d0a7 100644 --- a/composer/blog/gcp-tech-blog/data-orchestration-with-composer/noxfile_config.py +++ b/composer/blog/gcp-tech-blog/data-orchestration-with-composer/noxfile_config.py @@ -36,8 +36,7 @@ "3.6", "3.7", "3.9", - "3.10", - "3.11", + "3.10" ], # Composer w/ Airflow 2 only supports Python 3.8 # Old samples are opted out of enforcing Python type hints # All new samples should feature them diff --git a/composer/blog/gcp-tech-blog/unit-test-dags-cloud-build/noxfile_config.py b/composer/blog/gcp-tech-blog/unit-test-dags-cloud-build/noxfile_config.py index 5751b6d12eb..b90ef62c5b3 100644 --- a/composer/blog/gcp-tech-blog/unit-test-dags-cloud-build/noxfile_config.py +++ b/composer/blog/gcp-tech-blog/unit-test-dags-cloud-build/noxfile_config.py @@ -32,7 +32,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. # Skipping for Python 3.9 due to numpy compilation failure. - "ignored_versions": ["2.7", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/composer/cicd_sample/constraints.txt b/composer/cicd_sample/constraints.txt index 4d810fc1a63..938384b6c06 100644 --- a/composer/cicd_sample/constraints.txt +++ b/composer/cicd_sample/constraints.txt @@ -427,7 +427,7 @@ prompt-toolkit==3.0.30 proto-plus==1.19.6 protobuf==3.20.0 psutil==5.9.1 -psycopg2-binary==2.9.5 +psycopg2-binary==2.9.3 ptyprocess==0.7.0 pure-eval==0.2.2 pure-sasl==0.6.2 diff --git a/composer/cicd_sample/noxfile_config.py b/composer/cicd_sample/noxfile_config.py index a6ff5bec321..44a071d0d23 100644 --- a/composer/cicd_sample/noxfile_config.py +++ b/composer/cicd_sample/noxfile_config.py @@ -36,7 +36,6 @@ "3.7", "3.9", "3.10", - "3.11", ], # Composer w/ Airflow 2 only supports Python 3.8 # Old samples are opted out of enforcing Python type hints # All new samples should feature them diff --git a/composer/cicd_sample/utils/noxfile_config.py b/composer/cicd_sample/utils/noxfile_config.py index 756337f5790..738eaae84f9 100644 --- a/composer/cicd_sample/utils/noxfile_config.py +++ b/composer/cicd_sample/utils/noxfile_config.py @@ -36,7 +36,6 @@ "3.7", "3.9", "3.10", - "3.11", ], # Composer w/ Airflow 2 only supports Python 3.8 # Old samples are opted out of enforcing Python type hints # All new samples should feature them diff --git a/composer/workflows/constraints.txt b/composer/workflows/constraints.txt index de7f1dfd924..30bbdb77dc1 100644 --- a/composer/workflows/constraints.txt +++ b/composer/workflows/constraints.txt @@ -427,7 +427,7 @@ prompt-toolkit==3.0.30 proto-plus==1.19.6 protobuf==3.20.0 psutil==5.9.1 -psycopg2-binary==2.9.5 +psycopg2-binary==2.9.3 ptyprocess==0.7.0 pure-eval==0.2.2 pure-sasl==0.6.2 diff --git a/composer/workflows/noxfile_config.py b/composer/workflows/noxfile_config.py index 9eadce0eccd..6fa0836abfc 100644 --- a/composer/workflows/noxfile_config.py +++ b/composer/workflows/noxfile_config.py @@ -30,7 +30,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - 'ignored_versions': ["2.7", "3.6", "3.7", "3.9", "3.10", "3.11"], # Composer w/ Airflow 2 only supports Python 3.8 + 'ignored_versions': ["2.7", "3.6", "3.7", "3.9", "3.10"], # Composer w/ Airflow 2 only supports Python 3.8 # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/data-science-onramp/data-ingestion/noxfile_config.py b/data-science-onramp/data-ingestion/noxfile_config.py index a1d8b70d124..a15bf87246d 100644 --- a/data-science-onramp/data-ingestion/noxfile_config.py +++ b/data-science-onramp/data-ingestion/noxfile_config.py @@ -22,7 +22,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7", "3.6", "3.11"], + "ignored_versions": ["2.7", "3.6"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/data-science-onramp/data-processing/noxfile_config.py b/data-science-onramp/data-processing/noxfile_config.py index a1d8b70d124..a15bf87246d 100644 --- a/data-science-onramp/data-processing/noxfile_config.py +++ b/data-science-onramp/data-processing/noxfile_config.py @@ -22,7 +22,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7", "3.6", "3.11"], + "ignored_versions": ["2.7", "3.6"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/dataflow/custom-containers/miniconda/noxfile_config.py b/dataflow/custom-containers/miniconda/noxfile_config.py index de9fb1ae437..73281c052af 100644 --- a/dataflow/custom-containers/miniconda/noxfile_config.py +++ b/dataflow/custom-containers/miniconda/noxfile_config.py @@ -25,7 +25,7 @@ # > ℹ️ We're opting out of all Python versions except 3.9. # > The Python version used is defined by the Dockerfile, so it's redundant # > to run multiple tests since they would all be running the same Dockerfile. - "ignored_versions": ["2.7", "3.6", "3.7", "3.8", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.8", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/dataflow/custom-containers/minimal/noxfile_config.py b/dataflow/custom-containers/minimal/noxfile_config.py index de9fb1ae437..73281c052af 100644 --- a/dataflow/custom-containers/minimal/noxfile_config.py +++ b/dataflow/custom-containers/minimal/noxfile_config.py @@ -25,7 +25,7 @@ # > ℹ️ We're opting out of all Python versions except 3.9. # > The Python version used is defined by the Dockerfile, so it's redundant # > to run multiple tests since they would all be running the same Dockerfile. - "ignored_versions": ["2.7", "3.6", "3.7", "3.8", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.8", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/dataflow/custom-containers/ubuntu/noxfile_config.py b/dataflow/custom-containers/ubuntu/noxfile_config.py index de9fb1ae437..73281c052af 100644 --- a/dataflow/custom-containers/ubuntu/noxfile_config.py +++ b/dataflow/custom-containers/ubuntu/noxfile_config.py @@ -25,7 +25,7 @@ # > ℹ️ We're opting out of all Python versions except 3.9. # > The Python version used is defined by the Dockerfile, so it's redundant # > to run multiple tests since they would all be running the same Dockerfile. - "ignored_versions": ["2.7", "3.6", "3.7", "3.8", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.8", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/dataflow/encryption-keys/noxfile_config.py b/dataflow/encryption-keys/noxfile_config.py index bf456e51902..424daaa7731 100644 --- a/dataflow/encryption-keys/noxfile_config.py +++ b/dataflow/encryption-keys/noxfile_config.py @@ -22,7 +22,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7", "3.6", "3.8", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.8", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/dataflow/extensible-templates/noxfile_config.py b/dataflow/extensible-templates/noxfile_config.py index c6fba0d33de..d9fec8aa43a 100644 --- a/dataflow/extensible-templates/noxfile_config.py +++ b/dataflow/extensible-templates/noxfile_config.py @@ -22,7 +22,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7", "3.6", "3.7", "3.8", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.8", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/dataflow/flex-templates/streaming_beam/noxfile_config.py b/dataflow/flex-templates/streaming_beam/noxfile_config.py index 3a96712ab86..617c99c544a 100644 --- a/dataflow/flex-templates/streaming_beam/noxfile_config.py +++ b/dataflow/flex-templates/streaming_beam/noxfile_config.py @@ -25,7 +25,7 @@ # > ℹ️ We're opting out of all Python versions except 3.8. # > The Python version used is defined by the Dockerfile, so it's redundant # > to run multiple tests since they would all be running the same Dockerfile. - "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/dataflow/gpu-examples/pytorch-minimal/noxfile_config.py b/dataflow/gpu-examples/pytorch-minimal/noxfile_config.py index 624417bb0d5..9bc70f05ae3 100644 --- a/dataflow/gpu-examples/pytorch-minimal/noxfile_config.py +++ b/dataflow/gpu-examples/pytorch-minimal/noxfile_config.py @@ -25,7 +25,7 @@ # > ℹ️ We're opting out of all Python versions except 3.8. # > The Python version used is defined by the Dockerfile, so it's redundant # > to run multiple tests since they would all be running the same Dockerfile. - "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/dataflow/gpu-examples/tensorflow-landsat-prime/noxfile_config.py b/dataflow/gpu-examples/tensorflow-landsat-prime/noxfile_config.py index 66c0b730d22..84e226854c6 100644 --- a/dataflow/gpu-examples/tensorflow-landsat-prime/noxfile_config.py +++ b/dataflow/gpu-examples/tensorflow-landsat-prime/noxfile_config.py @@ -25,7 +25,7 @@ # > ℹ️ We're opting out of all Python versions except 3.8. # > The Python version used is defined by the Dockerfile, so it's redundant # > to run multiple tests since they would all be running the same Dockerfile. - "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/dataflow/gpu-examples/tensorflow-landsat/noxfile_config.py b/dataflow/gpu-examples/tensorflow-landsat/noxfile_config.py index 6df8bf22e84..e146837d8be 100644 --- a/dataflow/gpu-examples/tensorflow-landsat/noxfile_config.py +++ b/dataflow/gpu-examples/tensorflow-landsat/noxfile_config.py @@ -25,7 +25,7 @@ # > ℹ️ We're opting out of all Python versions except 3.8. # > The Python version used is defined by the Dockerfile, so it's redundant # > to run multiple tests since they would all be running the same Dockerfile. - "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/dataflow/gpu-examples/tensorflow-minimal/noxfile_config.py b/dataflow/gpu-examples/tensorflow-minimal/noxfile_config.py index 6df8bf22e84..e146837d8be 100644 --- a/dataflow/gpu-examples/tensorflow-minimal/noxfile_config.py +++ b/dataflow/gpu-examples/tensorflow-minimal/noxfile_config.py @@ -25,7 +25,7 @@ # > ℹ️ We're opting out of all Python versions except 3.8. # > The Python version used is defined by the Dockerfile, so it's redundant # > to run multiple tests since they would all be running the same Dockerfile. - "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/kubernetes_engine/django_tutorial/requirements.txt b/kubernetes_engine/django_tutorial/requirements.txt index cbcf6009677..36557e3c41c 100644 --- a/kubernetes_engine/django_tutorial/requirements.txt +++ b/kubernetes_engine/django_tutorial/requirements.txt @@ -7,4 +7,4 @@ wheel==0.38.1 gunicorn==20.1.0; python_version > '3.0' gunicorn==19.10.0; python_version < '3.0' # psycopg2==2.8.4 # uncomment if you prefer to build from source -psycopg2-binary==2.9.5 +psycopg2-binary==2.9.4 diff --git a/ml_engine/online_prediction/noxfile_config.py b/ml_engine/online_prediction/noxfile_config.py index bf456e51902..424daaa7731 100644 --- a/ml_engine/online_prediction/noxfile_config.py +++ b/ml_engine/online_prediction/noxfile_config.py @@ -22,7 +22,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7", "3.6", "3.8", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.8", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/noxfile-template.py b/noxfile-template.py index e98a487e83e..a768bbc6042 100644 --- a/noxfile-template.py +++ b/noxfile-template.py @@ -88,7 +88,7 @@ def get_pytest_env_vars() -> Dict[str, str]: # DO NOT EDIT - automatically generated. # All versions used to tested samples. -ALL_VERSIONS = ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] +ALL_VERSIONS = ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10"] # Any default versions that should be ignored. IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"] diff --git a/people-and-planet-ai/geospatial-classification/noxfile_config.py b/people-and-planet-ai/geospatial-classification/noxfile_config.py index 32517fec49a..fdc5de57de4 100644 --- a/people-and-planet-ai/geospatial-classification/noxfile_config.py +++ b/people-and-planet-ai/geospatial-classification/noxfile_config.py @@ -23,7 +23,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. # > ℹ️ We're opting out of all Python versions except 3.9 which is latest version TensorFlow supports - "ignored_versions": ["2.7", "3.6", "3.7", "3.8", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.8", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/people-and-planet-ai/image-classification/noxfile_config.py b/people-and-planet-ai/image-classification/noxfile_config.py index 56468a8902a..00771b23b49 100644 --- a/people-and-planet-ai/image-classification/noxfile_config.py +++ b/people-and-planet-ai/image-classification/noxfile_config.py @@ -23,7 +23,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. # NOTE: Apache Beam does not currently support Python 3.9 or 3.10. - "ignored_versions": ["2.7", "3.6", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/people-and-planet-ai/land-cover-classification/noxfile_config.py b/people-and-planet-ai/land-cover-classification/noxfile_config.py index 726ed738a66..a20701e9cef 100644 --- a/people-and-planet-ai/land-cover-classification/noxfile_config.py +++ b/people-and-planet-ai/land-cover-classification/noxfile_config.py @@ -24,7 +24,7 @@ # You can opt out from the test for specific Python versions. # ℹ️ Test only in Python 3.9 since that's what Dataflow currently supports: # https://cloud.google.com/dataflow/docs/support/beam-runtime-support - "ignored_versions": ["2.7", "3.6", "3.7", "3.8", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.8", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/people-and-planet-ai/timeseries-classification/noxfile_config.py b/people-and-planet-ai/timeseries-classification/noxfile_config.py index ea121ada32d..875316b92a7 100644 --- a/people-and-planet-ai/timeseries-classification/noxfile_config.py +++ b/people-and-planet-ai/timeseries-classification/noxfile_config.py @@ -25,7 +25,7 @@ # > ℹ️ We're opting out of all Python versions except 3.8. # > The Python version used is defined by the Dockerfile, so it's redundant # > to run multiple tests since they would all be running the same Dockerfile. - "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/pubsub/streaming-analytics/noxfile_config.py b/pubsub/streaming-analytics/noxfile_config.py index 46c09b7a624..cd0c0c40b97 100644 --- a/pubsub/streaming-analytics/noxfile_config.py +++ b/pubsub/streaming-analytics/noxfile_config.py @@ -22,7 +22,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7", "3.6", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": False, diff --git a/pubsublite/spark-connector/noxfile_config.py b/pubsublite/spark-connector/noxfile_config.py index 8cf1efb88b4..618515569b4 100644 --- a/pubsublite/spark-connector/noxfile_config.py +++ b/pubsublite/spark-connector/noxfile_config.py @@ -23,7 +23,7 @@ TEST_CONFIG_OVERRIDE = { # You can opt out from the test for specific Python versions. # NOTE: We currently only run the test in Python 3.8. - "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10", "3.11"], + "ignored_versions": ["2.7", "3.6", "3.7", "3.9", "3.10"], # Old samples are opted out of enforcing Python type hints # All new samples should feature them "enforce_type_hints": True, diff --git a/run/django/requirements.txt b/run/django/requirements.txt index 47cb76f36f8..fd9b13a2648 100644 --- a/run/django/requirements.txt +++ b/run/django/requirements.txt @@ -2,6 +2,6 @@ Django==4.0.4; python_version >= '3.8' Django==3.2.14; python_version < '3.8' django-storages[google]==1.13 django-environ==0.9.0 -psycopg2-binary==2.9.5 +psycopg2-binary==2.9.4 gunicorn==20.1.0 google-cloud-secret-manager==2.12.0