Merge branch 'main' into shuowei-deprecate-blob-notebook-updates

Author: shuoweil

.generator/Dockerfile

@@ -66,6 +66,7 @@ RUN unzip protoc-25.3-linux-x86_64.zip -d protoc
 
 # Download/extract pandoc
 # Pandoc is required by gapic-generator-python for parsing documentation
+# version-scanner: ignore-next-line
 ENV PANDOC_VERSION=3.8.2
 RUN mkdir pandoc-binary
 RUN wget https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/pandoc-${PANDOC_VERSION}-linux-amd64.tar.gz

.generator/cli.py

@@ -354,7 +354,7 @@ def _run_post_processor(output: str, library_id: str, is_mono_repo: bool):
         # TODO(https://github.com/googleapis/google-cloud-python/issues/15538):
         # Investigate if a `target_version needs to be maintained
         # or can be eliminated.
-        target_version = "py39"
+        target_version = "py310"
         common_args = [
             f"--target-version={target_version}",
             "--line-length=88",

.generator/test_cli.py

@@ -741,7 +741,7 @@ def test_run_individual_session_success(mocker, caplog, is_mono_repo):
         "cli.subprocess.run", return_value=MagicMock(returncode=0)
     )
 
-    test_session = "unit-3.9"
+    test_session = "unit-3.10"
     test_library_id = "test-library"
     repo = "repo"
     _run_individual_session(test_session, test_library_id, repo, is_mono_repo)

.github/workflows/gapic-generator-tests.yml

@@ -18,7 +18,7 @@ env:
   SHOWCASE_VERSION: 0.35.0
   PROTOC_VERSION: 3.20.2
   LATEST_STABLE_PYTHON: 3.14
-  ALL_PYTHON: "['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']"
+  ALL_PYTHON: "['3.10', '3.11', '3.12', '3.13', '3.14']"
 
 jobs:
   check_changes:

.kokoro/system.sh

@@ -133,14 +133,24 @@ for path in `find 'packages' \
   package_path="packages/${package_name}"
 
   # Determine if we should skip based on git diff
-  files_to_check="${package_path}/CHANGELOG.md"
+  # We always check for changes in these specific versioning/config files
+  files_to_check=(
+    "${package_path}/CHANGELOG.md"
+    "${package_path}/setup.py"
+    "${package_path}/pyproject.toml"
+    "${package_path}/**/gapic_version.py"
+    "${package_path}/**/version.py"
+  )
+
+  # If the package is in our "always run full system tests" list, check the whole directory
   if [[ $package_name == @($packages_with_system_tests_pattern) ]]; then
-    files_to_check="${package_path}"
+    files_to_check=("${package_path}")
   fi
 
-  echo "checking changes with 'git diff "${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}...${KOKORO_GITHUB_PULL_REQUEST_COMMIT}" -- ${files_to_check}'"
+  echo "checking changes with 'git diff ${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}...${KOKORO_GITHUB_PULL_REQUEST_COMMIT} -- ${files_to_check[*]}'"
   set +e
-  package_modified=$(git diff "${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}...${KOKORO_GITHUB_PULL_REQUEST_COMMIT}" -- ${files_to_check} | wc -l)
+  # Passing the array expanded as arguments to git diff
+  package_modified=$(git diff "${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}...${KOKORO_GITHUB_PULL_REQUEST_COMMIT}" -- "${files_to_check[@]}" | wc -l)
   set -e
 
   if [[ "${package_modified}" -gt 0 || "$KOKORO_BUILD_ARTIFACTS_SUBDIR" == *"continuous"* ]]; then

.librarian/config.yaml

@@ -27,13 +27,10 @@ libraries:
   # Allow release for google-crc32c once this bug is fixed.
   - id: "google-crc32c"
     release_blocked: true
-  # TODO(https://github.com/googleapis/google-cloud-python/issues/16780):
-  # Allow release for google-cloud-compute (and beta) after we've checked that
-  # the gRPC service config is okay.
-  - id: "google-cloud-compute"
-    release_blocked: true
-  - id: "google-cloud-compute-v1beta"
-    release_blocked: true
   # TODO(b/501132869): Disabling automatic releases until resolved.
   - id: "google-cloud-bigtable"
     release_blocked: true
+  # TODO(https://github.com/googleapis/google-cloud-python/issues/16780): Disabling automatic releases until resolved.
+  - id: "google-cloud-compute"
+    release_blocked: true
+

.pre-commit-config.yaml

@@ -26,6 +26,6 @@ repos:
     hooks:
     - id: black
 -   repo: https://github.com/pycqa/flake8
-    rev: 3.9.2
+    rev: 3.9.2 # version-scanner: ignore
     hooks:
     - id: flake8

ci/run_conditional_tests.sh

@@ -17,7 +17,7 @@
 # `BUILD_TYPE` should be one of ["presubmit", "continuous"]
 # `TEST_TYPE` should be one of ["docs", "docfx", "prerelease", "unit"]
 # or match the name of the nox session that you want to run.
-# `PY_VERSION` should be one of ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+# `PY_VERSION` should be one of ["3.10", "3.11", "3.12"]
 
 # `TEST_TYPE` and `PY_VERSION` are required by the script `ci/run_single_test.sh`
 

ci/run_single_test.sh

@@ -16,7 +16,7 @@
 
 # This script requires the following environment variables to be set:
 # `TEST_TYPE` should be one of ["lint", "lint_setup_py", "docs", "docfx", "prerelease"]
-# `PY_VERSION` should be one of ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+# `PY_VERSION` should be one of ["3.10", "3.11", "3.12", "3.13"]
 
 # This script is called by the `ci/run_conditional_tests.sh` script.
 # A specific `nox` session will be run, depending on the value of 
@@ -70,14 +70,6 @@ case ${TEST_TYPE} in
         ;;
     unit)
         case ${PY_VERSION} in
-        "3.7")
-            nox -s unit-3.7
-            retval=$?
-            ;;
-        "3.8")
-            nox -s unit-3.8
-            retval=$?
-            ;;
         "3.9")
             nox -s unit-3.9
             retval=$?

librarian.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 language: python
-version: v0.11.0
+version: v0.12.0
 repo: googleapis/google-cloud-python
 sources:
   googleapis:
@@ -747,6 +747,8 @@ libraries:
     python:
       metadata_name_override: compute
       default_version: v1
+    # TODO(https://github.com/googleapis/google-cloud-python/issues/16780): Disabling automatic releases until resolved.
+    skip_release: true
   - name: google-cloud-compute-v1beta
     version: 0.10.0
     apis: