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

fix(api): ignore missing aionotify more properly #8154

Merged
merged 2 commits into from
Jul 23, 2021
Merged

fix(api): ignore missing aionotify more properly #8154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6f6970
FIX: ignore missing aionotify more properly
mrakitin Jul 23, 2021
5bc890e
Remove aionotify import from test_modules.py
mrakitin Jul 23, 2021
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
2 changes: 1 addition & 1 deletion api/src/opentrons/hardware_control/controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from typing_extensions import Final
try:
import aionotify # type: ignore
except OSError:
except (OSError, ModuleNotFoundError):
aionotify = None # type: ignore

from opentrons.drivers.smoothie_drivers import driver_3_0
Expand Down
2 changes: 1 addition & 1 deletion api/tests/opentrons/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

try:
import aionotify
except OSError:
except (OSError, ModuleNotFoundError):
aionotify = None # type: ignore
import asyncio
import os
Expand Down
2 changes: 1 addition & 1 deletion api/tests/opentrons/hardware_control/test_instruments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from unittest import mock
try:
import aionotify
except OSError:
except (OSError, ModuleNotFoundError):
aionotify = None # type: ignore
import pytest
import typeguard
Expand Down
4 changes: 0 additions & 4 deletions api/tests/opentrons/hardware_control/test_modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
from pathlib import Path
from unittest import mock
import pytest
try:
import aionotify
except OSError:
aionotify = None # type: ignore
from opentrons.hardware_control import ExecutionManager
from opentrons.hardware_control.modules import ModuleAtPort
from opentrons.hardware_control.modules.types import (
Expand Down