Remove dependencies for Python <3.8
This project only supports Python 3.8 and newer. Remove the dependencies
that depend on Python versions less than 3.8. While here, merge Fuchsia
dependencies directly into the main dependencies.
Change-Id: I7914aeb43ab65358f3da470122220861e8bca862
Reviewed-on: https://fuchsia-review.googlesource.com/c/antlion/+/767547
Fuchsia-Auto-Submit: Sam Balana <sbalana@google.com>
Reviewed-by: Patrick Lu <patricklu@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
diff --git a/README.md b/README.md
index 374b5fa..f7d055a 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@
cd antlion
python3 -m venv .venv
source .venv/bin/activate
- pip install --editable .[dev] # development mode
+ pip install --editable .[dev,test]
```
3. Write the sample config and update the Fuchsia controller to match your
diff --git a/pyproject.toml b/pyproject.toml
index bb12e16..9cb96a3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,20 +12,22 @@
requires-python = ">=3.8"
license = {text = "Apache-2.0"}
dependencies = [
- "backoff",
- "future>=0.16.0", # Future needs to have a newer version that contains urllib.
+ "backoff",
+ "future>=0.16.0",
"mobly==1.12.0",
"pyyaml>=5.1",
"retry",
+ "usbinfo", # flash
+ "zeroconf", # mdns
]
[project.optional-dependencies]
# Required for running unit tests
test = [
+ "pytest",
# 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",
- "pytest",
]
# Required to support development tools
dev = [
@@ -37,44 +39,17 @@
digital_loggers_pdu = ['dlipower']
bluetooth = ['soundfile']
bokeh = [
- 'bokeh; python_version>="3.8"',
- 'bokeh<2.5; python_version>="3.7" and python_version<"3.8"',
- 'bokeh<2.4; python_version>="3.6" and python_version<"3.7"',
- 'bokeh<1.5; python_version>="3" and python_version<"3.6"',
+ "bokeh",
]
android = [
- "requests",
"Monsoon",
+ "numpy",
"paramiko[ed25519]",
"pylibftdi",
"pyserial",
+ "requests",
"scapy",
-
- 'scipy; python_version>="3.8"',
- 'scipy<1.8; python_version>="3.7" and python_version<"3.8"',
- 'scipy<1.6; python_version>="3.6" and python_version<"3.7"',
- 'scipy<1.5; python_version>="3" and python_version<"3.6"',
-
- 'numpy; python_version>="3.8"',
- 'numpy<1.22; python_version>="3.7" and python_version<"3.8"',
- 'numpy<1.20; python_version>="3.6" and python_version<"3.7"',
- 'numpy<1.19; python_version>="3" and python_version<"3.6"',
-]
-fuchsia = [
- "usbinfo", # flash
- "zeroconf", # mdns
-]
-old_python = [
- 'typing_extensions==4.1.1; python_version>="3.6" and python_version<"3.7"',
- 'typing_extensions<4.0.0; python_version>="3" and python_version<"3.6"',
-
- 'dataclasses==0.8; python_version=="3.6"',
-
- 'enum34; python_version<"3"',
- 'statistics; python_version<"3"',
- 'futures; python_version<"3"',
- 'py2-ipaddress; python_version<"3"',
- 'subprocess32; python_version<"3"',
+ "scipy",
]
[project.scripts]
@@ -85,22 +60,22 @@
[tool.autoflake]
imports = [
- "antlion",
- "backoff",
- "dataclasses",
- "numpy",
- "protobuf",
- "scipy",
"Monsoon",
+ "antlion",
+ "backoff",
+ "dataclasses",
"dlipower",
"future",
"mobly",
"mock",
+ "numpy",
"paramiko",
+ "protobuf",
"pylibftdi",
"requests",
"retry",
"scapy",
+ "scipy",
"usbinfo",
"zeroconf",
]
