Skip to content

Commit

Permalink
Revert "refactor(modules): return has update for unexpected module fw…
Browse files Browse the repository at this point in the history
… filename" (#14731)

Reverts #14712
  • Loading branch information
caila-marashaj committed Mar 25, 2024
1 parent 3094f5e commit 29414e2
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions api/src/opentrons/hardware_control/modules/mod_abc.py
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 @@ -88,15 +88,8 @@ 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:
# 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")
device_version = parse_version(self.device_info["version"])
available_version = parse_version(self._bundled_fw.version)
return cast(bool, available_version > device_version)
return False

Expand Down

0 comments on commit 29414e2

Please sign in to comment.