Configure opentrons-hardware to be included with OT-2 packages

* Make "python-can" an optional dependency for "opentrons_hardware" * Add "CAN" as an extra dependency for opentrons-hardware from the base opentrons pipfile * All "setup-ot2" targets just move python-can instead of the entire hardware package
Opentrons · Oct 11, 2023 · 59932d8 · 59932d8
1 parent e30c1b5
commit 59932d8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/api/Makefile b/api/Makefile
@@ -79,7 +79,7 @@ setup:
 .PHONY: setup-ot2
 setup-ot2:
 	$(pipenv) sync $(pipenv_opts)
-	$(pipenv) run pip uninstall -y opentrons_hardware
+	$(pipenv) run pip uninstall -y python-can
 	$(pipenv) run pip freeze
 
 .PHONY: clean

diff --git a/api/Pipfile b/api/Pipfile
@@ -36,7 +36,7 @@ types-mock = "==4.0.1"
 types-setuptools = "==57.0.2"
 opentrons-shared-data = { editable = true, path = "../shared-data/python" }
 opentrons = { editable = true, path = "." }
-opentrons-hardware = { editable = true, path = "./../hardware" }
+opentrons-hardware = { editable = true, path = "./../hardware", extras= ["CAN"] }
 # specify typing-extensions explicitly to force lockfile inclusion on Python >= 3.8
 typing-extensions = ">=4.0.0,<5"
 pytest-profiling = "~=1.7.0"

diff --git a/api/setup.py b/api/setup.py
@@ -60,6 +60,7 @@ def get_version():
 PACKAGES = find_packages(where="src")
 INSTALL_REQUIRES = [
     f"opentrons-shared-data=={VERSION}",
+    f"opentrons-hardware=={VERSION}",
     "aionotify==0.2.0",
     "anyio==3.3.0",
     "jsonschema==3.0.2",

diff --git a/hardware/setup.py b/hardware/setup.py
@@ -47,11 +47,14 @@ def get_version() -> str:
 DESCRIPTION = "Hardware control for Opentrons Robots."
 PACKAGES = find_packages(where=".", exclude=["tests.*", "tests"])
 INSTALL_REQUIRES = [
-    "python-can==3.3.4",
     "pyserial==3.5",
     f"opentrons_shared_data=={VERSION}",
 ]
 
+EXTRAS = {
+    "CAN": ["python-can==3.3.4"],
+}
+
 
 def read(*parts: str) -> str:
     """Build an absolute path from parts and return the contents of the resulting file.
@@ -80,6 +83,7 @@ def read(*parts: str) -> str:
         zip_safe=False,
         classifiers=CLASSIFIERS,
         install_requires=INSTALL_REQUIRES,
+        extras_require=EXTRAS,
         include_package_data=True,
         package_data={
             "opentrons_hardware": ["py.typed", "opentrons_hardware.cmakefind"]

diff --git a/notify-server/Makefile b/notify-server/Makefile
@@ -68,7 +68,7 @@ setup:
 .PHONY: setup-ot2
 setup-ot2:
 	$(pipenv) sync $(pipenv_opts)
-	$(pipenv) run pip uninstall -y opentrons_hardware
+	$(pipenv) run pip uninstall -y python-can
 	$(pipenv) run pip freeze
 
 .PHONY: clean

diff --git a/robot-server/Makefile b/robot-server/Makefile
@@ -82,7 +82,7 @@ setup:
 .PHONY: setup-ot2
 setup-ot2:
 	$(pipenv) sync $(pipenv_opts)
-	$(pipenv) run pip uninstall -y opentrons_hardware
+	$(pipenv) run pip uninstall -y python-can
 	$(pipenv) run pip freeze
 
 .PHONY: clean