Merge branch 'master' into client_callback_doc_clarify

bazel/internal_python_rules.bzl

@@ -14,7 +14,6 @@
 """Python-related rules intended only for use internal to the repo."""
 
 load("//bazel:gevent_test.bzl", "py_grpc_gevent_test")
-load("//bazel:logging_threshold_test.bzl", "py_grpc_logging_threshold_test")
 
 def internal_py_grpc_test(name, **kwargs):
     """Runs a test under all supported environments.
@@ -29,7 +28,6 @@ def internal_py_grpc_test(name, **kwargs):
         **kwargs
     )
     py_grpc_gevent_test(name, **kwargs)
-    py_grpc_logging_threshold_test(name, **kwargs)
 
     suite_kwargs = {}
     if "visibility" in kwargs:
@@ -40,7 +38,6 @@ def internal_py_grpc_test(name, **kwargs):
         tests = [
             name + ".native",
             name + ".gevent",
-            name + ".logging_threshold",
         ],
         **suite_kwargs
     )

tools/run_tests/artifacts/artifact_targets.py

@@ -160,7 +160,7 @@ class PythonArtifact:
                 ),
                 "tools/run_tests/artifacts/build_artifact_python.sh",
                 environ=environ,
-                timeout_seconds=60 * 60,
+                timeout_seconds=60 * 60 * 2,
             )
         elif "manylinux" in self.platform:
             if self.arch == "x86":