Merge pull request #24430 from lidizheng/patch-1-33-3-1

[Backport] 3.9 support on Linux x64 and fix grpc.aio import issue

src/python/grpcio/grpc/__init__.py

@@ -2125,6 +2125,6 @@ except ImportError:
     pass
 
 # Prevents import order issue in the case of renamed path.
-if sys.version_info >= (3, 6) and __name__ == "grpc.__init__":
+if sys.version_info >= (3, 6) and __name__ == "grpc":
     from grpc import aio  # pylint: disable=ungrouped-imports
     sys.modules.update({'grpc.aio': aio})

src/python/grpcio_tests/tests_aio/unit/init_test.py

@@ -14,17 +14,15 @@
 import logging
 import unittest
 
-from tests_aio.unit._test_base import AioTestBase
 
+class TestInit(unittest.TestCase):
 
-class TestInit(AioTestBase):
-
-    async def test_grpc(self):
+    def test_grpc(self):
         import grpc  # pylint: disable=wrong-import-position
         channel = grpc.aio.insecure_channel('dummy')
         self.assertIsInstance(channel, grpc.aio.Channel)
 
-    async def test_grpc_dot_aio(self):
+    def test_grpc_dot_aio(self):
         import grpc.aio  # pylint: disable=wrong-import-position
         channel = grpc.aio.insecure_channel('dummy')
         self.assertIsInstance(channel, grpc.aio.Channel)

tools/run_tests/artifacts/artifact_targets.py

@@ -356,6 +356,7 @@ def targets():
         PythonArtifact('manylinux2014', 'x64', 'cp36-cp36m'),
         PythonArtifact('manylinux2014', 'x64', 'cp37-cp37m'),
         PythonArtifact('manylinux2014', 'x64', 'cp38-cp38'),
+        PythonArtifact('manylinux2014', 'x64', 'cp39-cp39'),
         PythonArtifact('manylinux2014', 'x86', 'cp35-cp35m'),
         PythonArtifact('manylinux2014', 'x86', 'cp36-cp36m'),
         PythonArtifact('manylinux2014', 'x86', 'cp37-cp37m'),
@@ -367,6 +368,7 @@ def targets():
         PythonArtifact('manylinux2010', 'x64', 'cp36-cp36m'),
         PythonArtifact('manylinux2010', 'x64', 'cp37-cp37m'),
         PythonArtifact('manylinux2010', 'x64', 'cp38-cp38'),
+        PythonArtifact('manylinux2010', 'x64', 'cp39-cp39'),
         PythonArtifact('manylinux2010', 'x86', 'cp27-cp27m'),
         PythonArtifact('manylinux2010', 'x86', 'cp27-cp27mu'),
         PythonArtifact('manylinux2010', 'x86', 'cp35-cp35m'),