build: clean up generated noxfile (#2343)

Co-authored-by: ohmayr <omairn@google.com>

Author: parthea

gapic/templates/noxfile.py.j2

@@ -29,7 +29,7 @@ PACKAGE_NAME = '{{ api.naming.warehouse_package_name }}'
 
 BLACK_VERSION = "black==22.3.0"
 BLACK_PATHS = ["docs", "google", "tests", "samples", "noxfile.py", "setup.py"]
-DEFAULT_PYTHON_VERSION = "3.13"
+DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1]
 
 nox.sessions = [
     "unit",
@@ -51,7 +51,7 @@ nox.sessions = [
 def unit(session, protobuf_implementation):
     """Run the unit test suite."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     session.install('coverage', 'pytest', 'pytest-cov', 'pytest-asyncio', 'asyncmock; python_version < "3.8"')
@@ -85,7 +85,7 @@ def unit(session, protobuf_implementation):
 def prerelease_deps(session, protobuf_implementation):
     """Run the unit test suite against pre-release versions of dependencies."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     # Install test environment dependencies
@@ -120,8 +120,7 @@ def prerelease_deps(session, protobuf_implementation):
         "googleapis-common-protos",
         "google-api-core",
         "google-auth",
-        # Exclude grpcio!=1.67.0rc1 which does not support python 3.13
-        "grpcio!=1.67.0rc1",
+        "grpcio",
         "grpcio-status",
         "protobuf",
         "proto-plus",

tests/integration/goldens/asset/noxfile.py

@@ -40,7 +40,7 @@
 
 BLACK_VERSION = "black==22.3.0"
 BLACK_PATHS = ["docs", "google", "tests", "samples", "noxfile.py", "setup.py"]
-DEFAULT_PYTHON_VERSION = "3.13"
+DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1]
 
 nox.sessions = [
     "unit",
@@ -62,7 +62,7 @@
 def unit(session, protobuf_implementation):
     """Run the unit test suite."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     session.install('coverage', 'pytest', 'pytest-cov', 'pytest-asyncio', 'asyncmock; python_version < "3.8"')
@@ -95,7 +95,7 @@ def unit(session, protobuf_implementation):
 def prerelease_deps(session, protobuf_implementation):
     """Run the unit test suite against pre-release versions of dependencies."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     # Install test environment dependencies
@@ -130,8 +130,7 @@ def prerelease_deps(session, protobuf_implementation):
         "googleapis-common-protos",
         "google-api-core",
         "google-auth",
-        # Exclude grpcio!=1.67.0rc1 which does not support python 3.13
-        "grpcio!=1.67.0rc1",
+        "grpcio",
         "grpcio-status",
         "protobuf",
         "proto-plus",

tests/integration/goldens/credentials/noxfile.py

@@ -40,7 +40,7 @@
 
 BLACK_VERSION = "black==22.3.0"
 BLACK_PATHS = ["docs", "google", "tests", "samples", "noxfile.py", "setup.py"]
-DEFAULT_PYTHON_VERSION = "3.13"
+DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1]
 
 nox.sessions = [
     "unit",
@@ -62,7 +62,7 @@
 def unit(session, protobuf_implementation):
     """Run the unit test suite."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     session.install('coverage', 'pytest', 'pytest-cov', 'pytest-asyncio', 'asyncmock; python_version < "3.8"')
@@ -95,7 +95,7 @@ def unit(session, protobuf_implementation):
 def prerelease_deps(session, protobuf_implementation):
     """Run the unit test suite against pre-release versions of dependencies."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     # Install test environment dependencies
@@ -130,8 +130,7 @@ def prerelease_deps(session, protobuf_implementation):
         "googleapis-common-protos",
         "google-api-core",
         "google-auth",
-        # Exclude grpcio!=1.67.0rc1 which does not support python 3.13
-        "grpcio!=1.67.0rc1",
+        "grpcio",
         "grpcio-status",
         "protobuf",
         "proto-plus",

tests/integration/goldens/eventarc/noxfile.py

@@ -40,7 +40,7 @@
 
 BLACK_VERSION = "black==22.3.0"
 BLACK_PATHS = ["docs", "google", "tests", "samples", "noxfile.py", "setup.py"]
-DEFAULT_PYTHON_VERSION = "3.13"
+DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1]
 
 nox.sessions = [
     "unit",
@@ -62,7 +62,7 @@
 def unit(session, protobuf_implementation):
     """Run the unit test suite."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     session.install('coverage', 'pytest', 'pytest-cov', 'pytest-asyncio', 'asyncmock; python_version < "3.8"')
@@ -95,7 +95,7 @@ def unit(session, protobuf_implementation):
 def prerelease_deps(session, protobuf_implementation):
     """Run the unit test suite against pre-release versions of dependencies."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     # Install test environment dependencies
@@ -130,8 +130,7 @@ def prerelease_deps(session, protobuf_implementation):
         "googleapis-common-protos",
         "google-api-core",
         "google-auth",
-        # Exclude grpcio!=1.67.0rc1 which does not support python 3.13
-        "grpcio!=1.67.0rc1",
+        "grpcio",
         "grpcio-status",
         "protobuf",
         "proto-plus",

tests/integration/goldens/logging/noxfile.py

@@ -40,7 +40,7 @@
 
 BLACK_VERSION = "black==22.3.0"
 BLACK_PATHS = ["docs", "google", "tests", "samples", "noxfile.py", "setup.py"]
-DEFAULT_PYTHON_VERSION = "3.13"
+DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1]
 
 nox.sessions = [
     "unit",
@@ -62,7 +62,7 @@
 def unit(session, protobuf_implementation):
     """Run the unit test suite."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     session.install('coverage', 'pytest', 'pytest-cov', 'pytest-asyncio', 'asyncmock; python_version < "3.8"')
@@ -95,7 +95,7 @@ def unit(session, protobuf_implementation):
 def prerelease_deps(session, protobuf_implementation):
     """Run the unit test suite against pre-release versions of dependencies."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     # Install test environment dependencies
@@ -130,8 +130,7 @@ def prerelease_deps(session, protobuf_implementation):
         "googleapis-common-protos",
         "google-api-core",
         "google-auth",
-        # Exclude grpcio!=1.67.0rc1 which does not support python 3.13
-        "grpcio!=1.67.0rc1",
+        "grpcio",
         "grpcio-status",
         "protobuf",
         "proto-plus",

tests/integration/goldens/logging_internal/noxfile.py

@@ -40,7 +40,7 @@
 
 BLACK_VERSION = "black==22.3.0"
 BLACK_PATHS = ["docs", "google", "tests", "samples", "noxfile.py", "setup.py"]
-DEFAULT_PYTHON_VERSION = "3.13"
+DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1]
 
 nox.sessions = [
     "unit",
@@ -62,7 +62,7 @@
 def unit(session, protobuf_implementation):
     """Run the unit test suite."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     session.install('coverage', 'pytest', 'pytest-cov', 'pytest-asyncio', 'asyncmock; python_version < "3.8"')
@@ -95,7 +95,7 @@ def unit(session, protobuf_implementation):
 def prerelease_deps(session, protobuf_implementation):
     """Run the unit test suite against pre-release versions of dependencies."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     # Install test environment dependencies
@@ -130,8 +130,7 @@ def prerelease_deps(session, protobuf_implementation):
         "googleapis-common-protos",
         "google-api-core",
         "google-auth",
-        # Exclude grpcio!=1.67.0rc1 which does not support python 3.13
-        "grpcio!=1.67.0rc1",
+        "grpcio",
         "grpcio-status",
         "protobuf",
         "proto-plus",

tests/integration/goldens/redis/noxfile.py

@@ -40,7 +40,7 @@
 
 BLACK_VERSION = "black==22.3.0"
 BLACK_PATHS = ["docs", "google", "tests", "samples", "noxfile.py", "setup.py"]
-DEFAULT_PYTHON_VERSION = "3.13"
+DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1]
 
 nox.sessions = [
     "unit",
@@ -62,7 +62,7 @@
 def unit(session, protobuf_implementation):
     """Run the unit test suite."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     session.install('coverage', 'pytest', 'pytest-cov', 'pytest-asyncio', 'asyncmock; python_version < "3.8"')
@@ -95,7 +95,7 @@ def unit(session, protobuf_implementation):
 def prerelease_deps(session, protobuf_implementation):
     """Run the unit test suite against pre-release versions of dependencies."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     # Install test environment dependencies
@@ -130,8 +130,7 @@ def prerelease_deps(session, protobuf_implementation):
         "googleapis-common-protos",
         "google-api-core",
         "google-auth",
-        # Exclude grpcio!=1.67.0rc1 which does not support python 3.13
-        "grpcio!=1.67.0rc1",
+        "grpcio",
         "grpcio-status",
         "protobuf",
         "proto-plus",

tests/integration/goldens/redis_selective/noxfile.py

@@ -40,7 +40,7 @@
 
 BLACK_VERSION = "black==22.3.0"
 BLACK_PATHS = ["docs", "google", "tests", "samples", "noxfile.py", "setup.py"]
-DEFAULT_PYTHON_VERSION = "3.13"
+DEFAULT_PYTHON_VERSION = ALL_PYTHON[-1]
 
 nox.sessions = [
     "unit",
@@ -62,7 +62,7 @@
 def unit(session, protobuf_implementation):
     """Run the unit test suite."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     session.install('coverage', 'pytest', 'pytest-cov', 'pytest-asyncio', 'asyncmock; python_version < "3.8"')
@@ -95,7 +95,7 @@ def unit(session, protobuf_implementation):
 def prerelease_deps(session, protobuf_implementation):
     """Run the unit test suite against pre-release versions of dependencies."""
 
-    if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12", "3.13"):
+    if protobuf_implementation == "cpp" and float(session.python) > 3.10:
         session.skip("cpp implementation is not supported in python 3.11+")
 
     # Install test environment dependencies
@@ -130,8 +130,7 @@ def prerelease_deps(session, protobuf_implementation):
         "googleapis-common-protos",
         "google-api-core",
         "google-auth",
-        # Exclude grpcio!=1.67.0rc1 which does not support python 3.13
-        "grpcio!=1.67.0rc1",
+        "grpcio",
         "grpcio-status",
         "protobuf",
         "proto-plus",