Imports to allow editable mode

CederGroupHub · Mar 17, 2024 · ed1b67b · ed1b67b
1 parent 6269612
commit ed1b67b
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 23 deletions.
diff --git a/alab_management/_default/devices/default_device.py b/alab_management/_default/devices/default_device.py
@@ -1,6 +1,7 @@
 from typing import ClassVar
 
-from alab_management import BaseDevice, SamplePosition
+from alab_management.device_view import BaseDevice
+from alab_management.sample_view import SamplePosition
 
 
 class DefaultDevice(BaseDevice):

diff --git a/alab_management/builders/utils.py b/alab_management/builders/utils.py
@@ -8,7 +8,7 @@
 from .samplebuilder import SampleBuilder
 
 if TYPE_CHECKING:
-    from alab_management import BaseTask
+    from alab_management.task_view import BaseTask
 
 
 def append_task(

diff --git a/alab_management/task_manager/task_manager.py b/alab_management/task_manager/task_manager.py
@@ -15,8 +15,7 @@
 from bson import ObjectId
 from dramatiq_abort import abort
 
-from alab_management import BaseDevice
-from alab_management.device_view import get_all_devices
+from alab_management.device_view import BaseDevice, get_all_devices
 from alab_management.device_view.device_view import DeviceView
 from alab_management.lab_view import LabView
 from alab_management.logger import DBLogger, LoggingLevel

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -30,7 +30,7 @@
 author = "Alab Project Team"
 
 # The full version, including alpha/beta/rc tags
-from alab_management import __version__  # noqa
+from alab_management.__init__ import __version__  # noqa
 
 release = __version__
 

diff --git a/examples/fake_lab/__init__.py b/examples/fake_lab/__init__.py
@@ -1,9 +1,6 @@
-from alab_management import (
-    SamplePosition,
-    add_device,
-    add_standalone_sample_position,
-    add_task,
-)
+from alab_management.device_view import add_device
+from alab_management.sample_view import SamplePosition, add_standalone_sample_position
+from alab_management.task_view import add_task
 
 from .devices.furnace import Furnace
 from .devices.robot_arm import RobotArm

diff --git a/examples/fake_lab/devices/furnace.py b/examples/fake_lab/devices/furnace.py
@@ -1,7 +1,8 @@
 from threading import Timer
 from typing import ClassVar
 
-from alab_management import BaseDevice, SamplePosition
+from alab_management.device_view import BaseDevice
+from alab_management.sample_view import SamplePosition
 
 
 class Furnace(BaseDevice):

diff --git a/examples/fake_lab/devices/robot_arm.py b/examples/fake_lab/devices/robot_arm.py
@@ -1,6 +1,7 @@
 from typing import ClassVar
 
-from alab_management import BaseDevice, SamplePosition
+from alab_management.device_view import BaseDevice
+from alab_management.sample_view import SamplePosition
 
 
 class RobotArm(BaseDevice):

diff --git a/examples/fake_lab/tasks/heating.py b/examples/fake_lab/tasks/heating.py
@@ -2,7 +2,7 @@
 
 from bson import ObjectId
 
-from alab_management import BaseTask
+from alab_management.task_view import BaseTask
 from fake_lab.devices.furnace import Furnace
 
 from .moving import Moving

diff --git a/tests/fake_lab/__init__.py b/tests/fake_lab/__init__.py
@@ -1,9 +1,6 @@
-from alab_management import (
-    SamplePosition,
-    add_device,
-    add_standalone_sample_position,
-    add_task,
-)
+from alab_management.device_view import add_device
+from alab_management.sample_view import SamplePosition, add_standalone_sample_position
+from alab_management.task_view import add_task
 
 from .devices.furnace import Furnace
 from .devices.robot_arm import RobotArm

diff --git a/tests/fake_lab/devices/furnace.py b/tests/fake_lab/devices/furnace.py
@@ -1,7 +1,8 @@
 from threading import Timer
 from typing import ClassVar
 
-from alab_management import BaseDevice, SamplePosition
+from alab_management.device_view import BaseDevice
+from alab_management.sample_view import SamplePosition
 
 
 class Furnace(BaseDevice):

diff --git a/tests/fake_lab/devices/robot_arm.py b/tests/fake_lab/devices/robot_arm.py
@@ -1,6 +1,7 @@
 from typing import ClassVar
 
-from alab_management import BaseDevice, SamplePosition
+from alab_management.device_view import BaseDevice
+from alab_management.sample_view import SamplePosition
 
 
 class RobotArm(BaseDevice):

diff --git a/tests/fake_lab/tasks/heating.py b/tests/fake_lab/tasks/heating.py
@@ -2,7 +2,7 @@
 
 from bson import ObjectId
 
-from alab_management import BaseTask
+from alab_management.task_view import BaseTask
 
 from ..devices.furnace import Furnace  # noqa
 from .moving import Moving