Skip to content

chore: Remove dependency on scanspec #1366

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

Open
tpoliaw wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −9
Open

chore: Remove dependency on scanspec #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ dependencies = [
"ophyd-async>=0.13.5",
"aioca",
"pydantic>=2.0",
"scanspec>=0.9.0",
"pydantic-settings",
"stomp-py",
"PyYAML>=6.0.2",
Expand Down
25 changes: 19 additions & 6 deletions tests/system_tests/test_blueapi_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from bluesky_stomp.models import BasicAuthentication
from pydantic import TypeAdapter
from requests.exceptions import ConnectionError
from scanspec.specs import Line

from blueapi.client import BlueapiClient
from blueapi.client.event_bus import AnyEvent, BlueskyStreamingError
Expand Down Expand Up @@ -473,11 +472,25 @@ def test_delete_current_environment(client: BlueapiClient):
TaskRequest(
name="spec_scan",
params={
"detectors": [
"det",
],
"spec": Line("stage.x", 0.0, 10.0, 2)
* Line("stage.theta", 5.0, 15.0, 3),
"detectors": ["det"],
"spec": {
"outer": {
"axis": "stage.x",
"start": 0.0,
"stop": 10.0,
"num": 2,
"type": "Line",
},
"inner": {
"axis": "stage.theta",
"start": 5.0,
"stop": 15.0,
"num": 3,
"type": "Line",
},
"gap": True,
"type": "Product",
},
},
instrument_session=AUTHORIZED_INSTRUMENT_SESSION,
),
Expand Down
2 changes: 0 additions & 2 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading