diff options
author | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-05-05 01:52:24 +0000 |
---|---|---|
committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-05-05 01:52:24 +0000 |
commit | 8ca05fb152ed7fb24ea0a4b82b0fb36fa16406a8 (patch) | |
tree | e8a80472923350f6aa031856d293a6e5f533891f | |
parent | 5de8a29e29d12981e8a3ad55874d738666f35bc8 (diff) | |
parent | b56c0379d7cce9fe2e552dac54fd14b2e9317298 (diff) | |
download | connectivity-8ca05fb152ed7fb24ea0a4b82b0fb36fa16406a8.tar.gz |
[automerge] [DO NOT MERGE]Cherry-pick "Set typing_extensions to version 4.1.1; sort install-requires" from AOSP 2p: b56c0379d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/test/connectivity/+/17951301
Bug: 229623837
Change-Id: Ie8ea33622bdbd3b84e4912023d5e4476879b7302
-rwxr-xr-x | acts/framework/setup.py | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/acts/framework/setup.py b/acts/framework/setup.py index 6846b78c2..dde902541 100755 --- a/acts/framework/setup.py +++ b/acts/framework/setup.py @@ -24,44 +24,52 @@ import sys install_requires = [ 'backoff', + 'dlipower', # Future needs to have a newer version that contains urllib. 'future>=0.16.0', + 'grpcio', + 'mobly>=1.10.0', # Latest version of mock (4.0.0b) causes a number of compatibility issues with ACTS unit tests # b/148695846, b/148814743 'mock==3.0.5', + 'Monsoon', + # paramiko-ng is needed vs paramiko as currently paramiko does not support + # ed25519 ssh keys, which is what Fuchsia uses. + 'paramiko-ng', + 'protobuf>=3.14.0', + 'pylibftdi', + 'pynacl==1.4.0', 'pyserial', 'pyyaml>=5.1', - 'protobuf>=3.14.0', - 'retry', 'requests', + 'retry', 'scapy', - 'pylibftdi', + 'usbinfo', 'xlsxwriter', - 'mobly>=1.10.0', - 'grpcio', - 'Monsoon', - # paramiko-ng is needed vs paramiko as currently paramiko does not support - # ed25519 ssh keys, which is what Fuchsia uses. - 'paramiko-ng', - 'dlipower', 'zeroconf' ] +versioned_deps = { + 'numpy': 'numpy', + 'scipy': 'scipy' +} + # numpy and scipy version matrix per: # https://docs.scipy.org/doc/scipy/reference/toolchain.html +if sys.version_info < (3, 8): + versioned_deps['numpy'] = 'numpy<1.22' + versioned_deps['scipy'] = 'scipy<1.8' + +if sys.version_info < (3, 7): + versioned_deps['numpy'] = 'numpy<1.20' + versioned_deps['scipy'] = 'scipy<1.6' + versioned_deps['typing_extensions'] = 'typing_extensions==4.1.1' + if sys.version_info < (3, 6): - # Python <= 3.5 uses scipy up to 1.4 and numpy up to 1.18.x - # b/157117302:Monsoon dependency - install_requires.append('scipy<1.5') - install_requires.append('numpy<1.19') -elif sys.version_info < (3, 7): - # Python 3.6 uses scipy up to 1.5 and numpy up to 1.19.x - install_requires.append('scipy<1.6') - install_requires.append('numpy==1.18.1') -else: - # Python 3.7+ is supported by latest scipy and numpy - install_requires.append('scipy') - install_requires.append('numpy') + versioned_deps['numpy'] = 'numpy<1.19' + versioned_deps['scipy'] = 'scipy<1.5' + +install_requires += list(versioned_deps.values()) if sys.version_info < (3, ): install_requires.append('enum34') |