fix: Allow protobuf 6.x (#2142)

parthea · gcf-owl-bot[bot] · web-flow · commit 0842aa10967b · 2025-03-18T15:30:46.000-04:00
* fix: Allow protobuf 6.x * update prerelease_deps nox session so that prerelease versions of protobuf are installed * ensure python-bigquery is installed from source * feat: add support for Python 3.13 * restore replacement * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix typo --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -10,14 +10,15 @@ branchProtectionRules:
   requiresStrictStatusChecks: true
   requiredStatusCheckContexts:
     - 'Kokoro'
-    - 'Kokoro system-3.12'
-    - 'Kokoro snippets-3.12'
+    - 'Kokoro system-3.13'
+    - 'Kokoro snippets-3.13'
     - 'cla/google'
     - 'Samples - Lint'
     - 'Samples - Python 3.9'
     - 'Samples - Python 3.10'
     - 'Samples - Python 3.11'
     - 'Samples - Python 3.12'
+    - 'Samples - Python 3.13'
 - pattern: v2
   requiresLinearHistory: true
   requiresCodeOwnerReviews: true
diff --git a/.kokoro/continuous/prerelease-deps-3.13.cfg b/.kokoro/continuous/prerelease-deps-3.13.cfg
@@ -3,5 +3,5 @@
 # Only run this nox session.
 env_vars: {
     key: "NOX_SESSION"
-    value: "prerelease_deps-3.12"
+    value: "prerelease_deps-3.13"
 }
diff --git a/.kokoro/presubmit/snippets-3.13.cfg b/.kokoro/presubmit/snippets-3.13.cfg
@@ -3,5 +3,5 @@
 # Only run this nox session.
 env_vars: {
     key: "NOX_SESSION"
-    value: "snippets-3.12"
+    value: "snippets-3.13"
 }
diff --git a/.kokoro/presubmit/system-3.13.cfg b/.kokoro/presubmit/system-3.13.cfg
@@ -3,5 +3,5 @@
 # Only run this nox session.
 env_vars: {
     key: "NOX_SESSION"
-    value: "system-3.12"
-}
+    value: "system-3.13"
+}
diff --git a/.kokoro/presubmit/system-3.9.cfg b/.kokoro/presubmit/system-3.9.cfg
@@ -4,4 +4,4 @@
 env_vars: {
     key: "NOX_SESSION"
     value: "system-3.9"
-}
+}
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -143,12 +143,13 @@ Running System Tests
    $ nox -s system
 
    # Run a single system test
-   $ nox -s system-3.9 -- -k <name of test>
+   $ nox -s system-3.13 -- -k <name of test>
 
 
   .. note::
 
-      System tests are configured to run under Python 3.9, 3.11, 3.12.
+      System tests are only configured to run under Python 3.9 and 3.13.
+      For expediency, we do not run them in older versions of Python 3.
 
   This alone will not run the tests. You'll need to change some local
   auth settings and change some configuration in your project to
@@ -238,7 +239,7 @@ Supported versions can be found in our ``noxfile.py`` `config`_.
 .. _config: https://github.com/googleapis/python-bigquery/blob/main/noxfile.py
 
 
-We also explicitly decided to support Python 3 beginning with version 3.7.
+We also explicitly decided to support Python 3 beginning with version 3.9.
 Reasons for this include:
 
 -  Encouraging use of newest versions of Python 3
diff --git a/noxfile.py b/noxfile.py
@@ -38,8 +38,8 @@
 )
 
 DEFAULT_PYTHON_VERSION = "3.9"
-SYSTEM_TEST_PYTHON_VERSIONS = ["3.9", "3.11", "3.12"]
-UNIT_TEST_PYTHON_VERSIONS = ["3.9", "3.11", "3.12"]
+SYSTEM_TEST_PYTHON_VERSIONS = ["3.9", "3.11", "3.12", "3.13"]
+UNIT_TEST_PYTHON_VERSIONS = ["3.9", "3.11", "3.12", "3.13"]
 CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
 
 
@@ -362,6 +362,40 @@ def prerelease_deps(session):
 
     https://github.com/googleapis/python-bigquery/issues/95
     """
+    # Because we test minimum dependency versions on the minimum Python
+    # version, the first version we test with in the unit tests sessions has a
+    # constraints file containing all dependencies and extras.
+    with open(
+        CURRENT_DIRECTORY
+        / "testing"
+        / f"constraints-{UNIT_TEST_PYTHON_VERSIONS[0]}.txt",
+        encoding="utf-8",
+    ) as constraints_file:
+        constraints_text = constraints_file.read()
+
+    # Ignore leading whitespace and comment lines.
+    deps = [
+        match.group(1)
+        for match in re.finditer(
+            r"^\s*(\S+)(?===\S+)", constraints_text, flags=re.MULTILINE
+        )
+    ]
+
+    session.install(*deps)
+
+    session.install(
+        "--pre",
+        "--upgrade",
+        "freezegun",
+        "google-cloud-datacatalog",
+        "google-cloud-resource-manager",
+        "google-cloud-storage",
+        "google-cloud-testutils",
+        "psutil",
+        "pytest",
+        "pytest-cov",
+    )
+
     # PyArrow prerelease packages are published to an alternative PyPI host.
     # https://arrow.apache.org/docs/python/install.html#installing-nightly-packages
     session.install(
@@ -386,48 +420,18 @@ def prerelease_deps(session):
     session.install(
         "--pre",
         "--upgrade",
+        "--no-deps",
         "google-api-core",
         "google-cloud-bigquery-storage",
         "google-cloud-core",
         "google-resumable-media",
         "db-dtypes",
-        # Exclude version 1.49.0rc1 which has a known issue. See https://github.com/grpc/grpc/pull/30642
-        "grpcio!=1.49.0rc1",
-    )
-    session.install(
-        "freezegun",
-        "google-cloud-datacatalog",
-        "google-cloud-resource-manager",
-        "google-cloud-storage",
-        "google-cloud-testutils",
-        "psutil",
-        "pytest",
-        "pytest-cov",
+        "grpcio",
+        "protobuf",
     )
 
-    # Because we test minimum dependency versions on the minimum Python
-    # version, the first version we test with in the unit tests sessions has a
-    # constraints file containing all dependencies and extras.
-    with open(
-        CURRENT_DIRECTORY
-        / "testing"
-        / f"constraints-{UNIT_TEST_PYTHON_VERSIONS[0]}.txt",
-        encoding="utf-8",
-    ) as constraints_file:
-        constraints_text = constraints_file.read()
-
-    # Ignore leading whitespace and comment lines.
-    deps = [
-        match.group(1)
-        for match in re.finditer(
-            r"^\s*(\S+)(?===\S+)", constraints_text, flags=re.MULTILINE
-        )
-    ]
-
-    # We use --no-deps to ensure that pre-release versions aren't overwritten
-    # by the version ranges in setup.py.
-    session.install(*deps)
-    session.install("--no-deps", "-e", ".[all]")
+    # Ensure that this library is installed from source
+    session.install("-e", ".", "--no-deps")
 
     # Print out prerelease package versions.
     session.run("python", "-m", "pip", "freeze")
diff --git a/owlbot.py b/owlbot.py
@@ -55,6 +55,9 @@
         "geopandas": "https://geopandas.org/",
         "pandas": "https://pandas.pydata.org/pandas-docs/stable/",
     },
+    system_test_python_versions=["3.9", "3.13"],
+    unit_test_python_versions=["3.9", "3.10", "3.11", "3.12", "3.13"],
+    default_python_version="3.9",
 )
 
 # BigQuery has a custom multiprocessing note
@@ -86,41 +89,13 @@
 python3.9 -m pip install --upgrade --quiet nox virtualenv==20.26.6""",
     "python3.9 -m pip install --upgrade --quiet nox virtualenv",
 )
-s.replace(
-    "CONTRIBUTING.rst",
-    "3.7, 3.8, 3.9, 3.10, 3.11, 3.12 and 3.13 on both UNIX and Windows.",
-    "3.9, 3.10, 3.11, 3.12 and 3.13 on both UNIX and Windows.",
-)
-s.replace(
-    "CONTRIBUTING.rst",
-    r"   \$ nox -s system-3.8 -- -k <name of test>",
-    r"   $ nox -s system-3.9 -- -k <name of test>",
-)
-s.replace(
-    "CONTRIBUTING.rst",
-    r"""System tests are only configured to run under Python 3.8.
-      For expediency, we do not run them in older versions of Python 3.""",
-    r"System tests are configured to run under Python 3.9, 3.11, 3.12.",
-)
+
 s.replace(
     "CONTRIBUTING.rst",
     r"\$ nox -s py-3.8",
     r"$ nox -s py-3.9",
 )
-s.replace(
-    "CONTRIBUTING.rst",
-    r"""-  `Python 3.7`_
--  `Python 3.8`_
-""",
-    r"",
-)
-s.replace(
-    "CONTRIBUTING.rst",
-    r""".. _Python 3.7: https://docs.python.org/3.7/
-.. _Python 3.8: https://docs.python.org/3.8/
-""",
-    r"",
-)
+
 s.replace(
     "scripts/readme-gen/templates/install_deps.tmpl.rst",
     r"Samples are compatible with Python 3.7",
diff --git a/pyproject.toml b/pyproject.toml
@@ -37,17 +37,18 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Operating System :: OS Independent",
   "Topic :: Internet",
 ]
 dependencies = [
-  "google-api-core[grpc] >= 2.11.1, < 3.0.0dev",
-  "google-auth >= 2.14.1, < 3.0.0dev",
-  "google-cloud-core >= 2.4.1, < 3.0.0dev",
-  "google-resumable-media >= 2.0.0, < 3.0dev",
+  "google-api-core[grpc] >= 2.11.1, < 3.0.0",
+  "google-auth >= 2.14.1, < 3.0.0",
+  "google-cloud-core >= 2.4.1, < 3.0.0",
+  "google-resumable-media >= 2.0.0, < 3.0.0",
   "packaging >= 24.2.0",
-  "python-dateutil >= 2.8.2, < 3.0dev",
-  "requests >= 2.21.0, < 3.0.0dev",
+  "python-dateutil >= 2.8.2, < 3.0.0",
+  "requests >= 2.21.0, < 3.0.0",
 ]
 dynamic = ["version"]
 
@@ -59,37 +60,37 @@ Repository = "https://github.com/googleapis/python-bigquery"
 # moved back to optional due to bloat.  See
 # https://github.com/googleapis/python-bigquery/issues/1196 for more background.
 bqstorage = [
-  "google-cloud-bigquery-storage >= 2.18.0, < 3.0.0dev",
+  "google-cloud-bigquery-storage >= 2.18.0, < 3.0.0",
   # Due to an issue in pip's dependency resolver, the `grpc` extra is not
   # installed, even though `google-cloud-bigquery-storage` specifies it
   # as `google-api-core[grpc]`. We thus need to explicitly specify it here.
   # See: https://github.com/googleapis/python-bigquery/issues/83 The
   # grpc.Channel.close() method isn't added until 1.32.0.
   # https://github.com/grpc/grpc/pull/15254
-  "grpcio >= 1.47.0, < 2.0dev",
-  "grpcio >= 1.49.1, < 2.0dev; python_version >= '3.11'",
+  "grpcio >= 1.47.0, < 2.0.0",
+  "grpcio >= 1.49.1, < 2.0.0; python_version >= '3.11'",
   "pyarrow >= 4.0.0",
 ]
 pandas = [
   "pandas >= 1.1.4",
-  "pandas-gbq >= 0.26.1; python_version >= '3.8'",
-  "grpcio >= 1.47.0, < 2.0dev",
-  "grpcio >= 1.49.1, < 2.0dev; python_version >= '3.11'",
+  "pandas-gbq >= 0.26.1",
+  "grpcio >= 1.47.0, < 2.0.0",
+  "grpcio >= 1.49.1, < 2.0.0; python_version >= '3.11'",
   "pyarrow >= 3.0.0",
-  "db-dtypes >= 1.0.4, < 2.0.0dev",
+  "db-dtypes >= 1.0.4, < 2.0.0",
 ]
 ipywidgets = ["ipywidgets >= 7.7.1", "ipykernel >= 6.2.0"]
-geopandas = ["geopandas >= 0.9.0, < 2.0dev", "Shapely >= 1.8.4, < 3.0.0dev"]
+geopandas = ["geopandas >= 0.9.0, < 2.0.0", "Shapely >= 1.8.4, < 3.0.0"]
 ipython = ["ipython >= 7.23.1", "bigquery-magics >= 0.6.0"]
-tqdm = ["tqdm >= 4.7.4, < 5.0.0dev"]
+tqdm = ["tqdm >= 4.7.4, < 5.0.0"]
 opentelemetry = [
   "opentelemetry-api >= 1.1.0",
   "opentelemetry-sdk >= 1.1.0",
   "opentelemetry-instrumentation >= 0.20b0",
 ]
 bigquery_v2 = [
-  "proto-plus >= 1.22.3, < 2.0.0dev",
-  "protobuf >= 3.20.2, < 6.0.0dev, != 4.21.0, != 4.21.1, != 4.21.2, != 4.21.3, != 4.21.4, != 4.21.5", # For the legacy proto-based types.
+  "proto-plus >= 1.22.3, < 2.0.0",
+  "protobuf >= 3.20.2, < 7.0.0, != 4.21.0, != 4.21.1, != 4.21.2, != 4.21.3, != 4.21.4, != 4.21.5", # For the legacy proto-based types.
 ]
 all = [
   "google-cloud-bigquery[bqstorage,pandas,ipywidgets,geopandas,ipython,tqdm,opentelemetry,bigquery_v2]",
diff --git a/testing/constraints-3.13.txt b/testing/constraints-3.13.txt
