Add bokeh dependency to acts_tests am: 6be78e0734
Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/2008270
Change-Id: I417c8cb7f2f0148b17806935918caad8d8f65683
diff --git a/acts_tests/setup.py b/acts_tests/setup.py
index 9f77e9e..6c0a4a6 100755
--- a/acts_tests/setup.py
+++ b/acts_tests/setup.py
@@ -32,6 +32,18 @@
install_requires = ['soundfile']
+if sys.version_info < (3, 6):
+ # Python <= 3.5 uses bokeh up to 1.4.x
+ install_requires.append('bokeh<1.5')
+elif sys.version_info < (3, 7):
+ # Python 3.6 uses bokeh up to 2.3.x
+ install_requires.append('bokeh<2.4')
+elif sys.version_info < (3, 8):
+ # Python 3.7+ uses bokeh up to 2.4.x
+ install_requires.append('bokeh<2.5')
+else:
+ # Python 3.8+ is support by latest bokeh
+ install_requires.append('bokeh')
def _setup_acts_framework(option, *args):
@@ -68,6 +80,7 @@
Otherwise, it will attempt to locate the ACTS framework from the local
repository.
"""
+
def run(self):
_setup_acts_framework('install')
# Calling install.run() directly fails to install the dependencies as
@@ -81,6 +94,7 @@
See ActsContribInstall for more details.
"""
+
def run(self):
super().run()
if self.uninstall:
@@ -145,8 +159,9 @@
acts_contrib_module: The acts_contrib module to uninstall.
"""
for acts_contrib_install_dir in acts_contrib_module.__path__:
- self.announce('Deleting acts_contrib from: %s'
- % acts_contrib_install_dir, log.INFO)
+ self.announce(
+ 'Deleting acts_contrib from: %s' % acts_contrib_install_dir,
+ log.INFO)
shutil.rmtree(acts_contrib_install_dir)
def run(self):
@@ -163,8 +178,9 @@
try:
import acts_contrib as acts_contrib_module
except ImportError:
- self.announce('acts_contrib is not installed, nothing to uninstall.',
- level=log.ERROR)
+ self.announce(
+ 'acts_contrib is not installed, nothing to uninstall.',
+ level=log.ERROR)
return
while acts_contrib_module:
@@ -183,7 +199,7 @@
def main():
os.chdir(acts_tests_dir)
- packages = setuptools.find_packages(include=('acts_contrib*',))
+ packages = setuptools.find_packages(include=('acts_contrib*', ))
setuptools.setup(name='acts_contrib',
version='0.9',
description='Android Comms Test Suite',