commit 4aaa5d876c4bd4d1ca2eea47231a697bae6539d7
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 17 02:15:37 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 17 02:15:37 2020 +0000
tree 7cdc563ca657ddd82af06b136ad0432255f24f4e
parent d4a260256c9b90b139008d9f270658471f44b725
parent 8dbe1ce6aa5823d903afe893566e2eff73856cfa

Merge "Adding ignore_status=True to wpa_cli logging cmd"

acts/framework/acts/test_utils/instrumentation/power/data_graph/__init__.py

diff --git a/acts/framework/acts/test_utils/instrumentation/power/data_graph/__init__.py b/acts/framework/acts/test_utils/instrumentation/power/data_graph/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/acts/framework/acts/test_utils/instrumentation/power/data_graph/__init__.py

acts/framework/setup.py

diff --git a/acts/framework/setup.py b/acts/framework/setup.py
index 152d679..d23977c 100755
--- a/acts/framework/setup.py
+++ b/acts/framework/setup.py
@@ -36,7 +36,7 @@
     'pyserial',
     'pyyaml>=5.1',
     'tzlocal',
-    'protobuf>=3.11.3',
+    'protobuf>=3.14.0',
     'retry',
     'requests',
     'scapy',

acts_tests/setup.py

diff --git a/acts_tests/setup.py b/acts_tests/setup.py
index 4dbf6f7..f11417c 100755
--- a/acts_tests/setup.py
+++ b/acts_tests/setup.py
@@ -39,7 +39,7 @@
     'numpy',
     'pyserial',
     'pyyaml>=5.1',
-    'protobuf>=3.11.3',
+    'protobuf>=3.14.0',
     'requests',
     'scapy',
     'xlsxwriter',