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

Jump to bottom

refactor(modules): return has update for unexpected module fw filename #14712

Merged
merged 3 commits into from
Mar 25, 2024
Merged

refactor(modules): return has update for unexpected module fw filename #14712

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0fdbe2
return has update for unexpected module fw filename
caila-marashaj Mar 21, 2024
b8ba281
change regex instead
caila-marashaj Mar 21, 2024
ee0a015
revert regex and try catch version update
caila-marashaj Mar 22, 2024
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
13 changes: 10 additions & 3 deletions api/src/opentrons/hardware_control/modules/mod_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import re
from pkg_resources import parse_version
from typing import ClassVar, Mapping, Optional, cast, TypeVar

from packaging.version import InvalidVersion
from opentrons.config import IS_ROBOT, ROBOT_FIRMWARE_DIR
from opentrons.drivers.rpi_drivers.types import USBPort

Expand Down Expand Up @@ -87,8 +87,15 @@ def get_bundled_fw(self) -> Optional[BundledFirmware]:
def has_available_update(self) -> bool:
"""Return whether a newer firmware file is available"""
if self.device_info and self._bundled_fw:
device_version = parse_version(self.device_info["version"])
available_version = parse_version(self._bundled_fw.version)
# try catch this
try:
device_version = parse_version(self.device_info["version"])
except InvalidVersion:
device_version = parse_version("v0.0.0")
try:
available_version = parse_version(self._bundled_fw.version)
except InvalidVersion:
available_version = parse_version("v0.0.0")
return cast(bool, available_version > device_version)
return False

Expand Down
Loading