handle breaking changes from 3.7 to 3.10

Opentrons · Nov 9, 2023 · 5ea70d5 · 5ea70d5
1 parent 692888c
commit 5ea70d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/api/src/opentrons/drivers/smoothie_drivers/driver_3_0.py b/api/src/opentrons/drivers/smoothie_drivers/driver_3_0.py
@@ -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)

diff --git a/scripts/push.mk b/scripts/push.mk
@@ -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
 

diff --git a/scripts/python.mk b/scripts/python.mk
@@ -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