commit 20d5f0c097a64f1577a08d9bdb33deb86b9dfb5b
author Jerry Jia <xianyuanjia@google.com> Mon Sep 26 20:38:03 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 26 20:38:03 2022 +0000
tree c9479b2169569bbb33a732509c24196cc415b0d5
parent 60361af896333e04bc3c87d4fd3e9d082cf27a10
parent dc1776402b6546f9a7cced2d5230693b208062a8

Merge "Fix grpcio version for Python 3.6"

acts/framework/setup.py

diff --git a/acts/framework/setup.py b/acts/framework/setup.py
index cc09235..81eb251 100755
--- a/acts/framework/setup.py
+++ b/acts/framework/setup.py
@@ -26,7 +26,6 @@
     'backoff',
     # Future needs to have a newer version that contains urllib.
     'future>=0.16.0',
-    'grpcio',
     'mobly==1.12.0',
     # Latest version of mock (4.0.0b) causes a number of compatibility issues with ACTS unit tests
     # b/148695846, b/148814743
@@ -46,7 +45,8 @@
 versioned_deps = {
     'numpy': 'numpy',
     'scipy': 'scipy',
-    'protobuf': 'protobuf==4.21.5'
+    'protobuf': 'protobuf==4.21.5',
+    'grpcio': 'grpcio',
 }
 
 # numpy and scipy version matrix per:
@@ -58,6 +58,7 @@
     versioned_deps['numpy'] = 'numpy<1.20'
     versioned_deps['scipy'] = 'scipy<1.6'
     versioned_deps['protobuf'] = 'protobuf==3.20.1'
+    versioned_deps['grpcio'] = 'grpcio==1.48.2'
     versioned_deps['typing_extensions'] = 'typing_extensions==4.1.1'
 if (sys.version_info.major, sys.version_info.minor) == (3, 6):
     versioned_deps['dataclasses'] = 'dataclasses==0.8'