Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(api): handle breaking changes on OT2 from 3.7 to 3.10 #14050

Merged
merged 1 commit into from
Nov 28, 2023
Merged

chore(api): handle breaking changes on OT2 from 3.7 to 3.10 #14050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/src/opentrons/drivers/smoothie_drivers/driver_3_0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1896,8 +1896,8 @@ async def update_firmware( # noqa: C901
"stdout": asyncio.subprocess.PIPE,
"stderr": asyncio.subprocess.PIPE,
}
if loop:
kwargs["loop"] = loop
#if loop:
# kwargs["loop"] = loop
log.info(update_cmd)
before = time()
proc = await asyncio.create_subprocess_shell(update_cmd, **kwargs)
Expand Down
2 changes: 1 addition & 1 deletion scripts/push.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ scp $(call id-file-arg,$(2)) $(scp-legacy-option-flag) $(3) "$(4)" root@$(1):/da
ssh $(call id-file-arg,$(2)) $(3) root@$(1) \
"function cleanup () { rm -f /data/$(notdir $(4)) && mount -o remount,ro / ; } ;\
mount -o remount,rw / &&\
cd /usr/lib/python3.7/site-packages &&\
cd /usr/lib/python3.10/site-packages &&\
unzip -o /data/$(notdir $(4)) && cleanup || cleanup"
endef

Expand Down
2 changes: 1 addition & 1 deletion scripts/python.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ OT_PYTHON ?= python
# Python version to use for a project's virtual environment.
# Defaults to Python 3.7, which is the version that runs on the OT-2.
# https://pipenv.pypa.io/en/latest/basics/#specifying-versions-of-python
OT_VIRTUALENV_VERSION ?= 3.7
OT_VIRTUALENV_VERSION ?= 3.10

# Use legacy editable installs to avoid breaking mypy type-checking
# when using newer versions of setuptools
Expand Down
Loading