Skip to content

Commit

Permalink
Updates from Seth's review
Browse files Browse the repository at this point in the history
- Updated the can-related extra requirement in opentrons_hardware to "flex"
- Added extra requirements to API for either "ot2-hardware" or "flex-hardware"
  • Loading branch information
fsinapi committed Oct 12, 2023
1 parent 317636e commit a81ef47
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion api/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -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", extras= ["CAN"] }
opentrons-hardware = { editable = true, path = "./../hardware", extras= ["FLEX"] }
# specify typing-extensions explicitly to force lockfile inclusion on Python >= 3.8
typing-extensions = ">=4.0.0,<5"
pytest-profiling = "~=1.7.0"
Expand Down
7 changes: 6 additions & 1 deletion api/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ 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",
Expand All @@ -72,6 +71,11 @@ def get_version():
'importlib-metadata >= 1.0 ; python_version < "3.8"',
]

EXTRAS = {
"ot2-hardware": [f"opentrons-hardware=={VERSION}"],
"flex-hardware": [f"opentrons-hardware[FLEX]=={VERSION}"],
}


def read(*parts):
"""
Expand Down Expand Up @@ -99,6 +103,7 @@ def read(*parts):
zip_safe=False,
classifiers=CLASSIFIERS,
install_requires=INSTALL_REQUIRES,
extras_require=EXTRAS,
include_package_data=True,
package_dir={"": "src"},
package_data={"opentrons": ["py.typed"]},
Expand Down
2 changes: 1 addition & 1 deletion hardware/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def get_version() -> str:
]

EXTRAS = {
"CAN": ["python-can==3.3.4"],
"FLEX": ["python-can==3.3.4"],
}


Expand Down

0 comments on commit a81ef47

Please sign in to comment.