diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 76baa77..13da0e9 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -22,8 +22,8 @@ jobs: python -m pip install --upgrade pip pip install . pip install .[dev] - git clone https://github.com/als-computing/arroyo.git - pip install ./arroyo + git clone https://github.com/als-computing/arroyopy.git + pip install ./arroyopy - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names diff --git a/.gitmodules b/.gitmodules index 0ce9518..a6f4b92 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "arroyo"] - path = arroyo - url = git@github.com:als-computing/arroyo.git +[submodule "arroyopy"] + path = arroyopy + url = https://github.com/als-computing/arroyopy.git diff --git a/AP-XPS.code-workspace b/AP-XPS.code-workspace index 8558ff1..6d14500 100644 --- a/AP-XPS.code-workspace +++ b/AP-XPS.code-workspace @@ -4,7 +4,7 @@ "path": "." }, { - "path": "../arroyo" + "path": "../arroyopy" } ] -} +} \ No newline at end of file diff --git a/Dockerfile_labviewsim b/Dockerfile_labviewsim index 7129005..afae97a 100644 --- a/Dockerfile_labviewsim +++ b/Dockerfile_labviewsim @@ -6,7 +6,7 @@ RUN apt install git COPY . /app -RUN pip install ./arroyo +RUN pip install ./arroyopy RUN pip install --no-cache-dir --upgrade . RUN pip install --no-cache-dir .[simulator] diff --git a/Dockerfile_processor b/Dockerfile_processor index 1323c71..79f7529 100644 --- a/Dockerfile_processor +++ b/Dockerfile_processor @@ -3,7 +3,7 @@ FROM python:3.11 WORKDIR /app COPY . /app -RUN pip install ./arroyo +RUN pip install ./arroyopy RUN pip install --no-cache-dir --upgrade . CMD ["python", "-m", "tr_ap_xps.apps.processor_cli"] diff --git a/arroyo b/arroyo deleted file mode 160000 index feb7eb9..0000000 --- a/arroyo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit feb7eb97ec72ba8014275d07314b1c20b52d489c diff --git a/docker-compose.yml b/docker-compose.yml index 555787d..e7afe94 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,7 @@ services: tiled: # see the file ./tiled/deploy/config.yml for detailed configuration of tiled image: ghcr.io/bluesky/tiled:main + platform: linux/amd64 ports: - "8000:8000" environment: diff --git a/pyproject.toml b/pyproject.toml index cf68b2d..5532f76 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,8 @@ dependencies = [ "tqdm", "typer", "websockets", - "zarr" + "zarr", + "scipy", ] [project.optional-dependencies] diff --git a/src/tr_ap_xps/labview.py b/src/tr_ap_xps/labview.py index b82424e..07a44b6 100644 --- a/src/tr_ap_xps/labview.py +++ b/src/tr_ap_xps/labview.py @@ -5,7 +5,7 @@ import numpy as np import zmq.asyncio -from arroyo.zmq import ZMQListener +from arroyopy.zmq import ZMQListener from .config import settings from .schemas import NumpyArrayModel, XPSImageInfo, XPSRawEvent, XPSStart, XPSStop diff --git a/src/tr_ap_xps/pipeline/xps_operator.py b/src/tr_ap_xps/pipeline/xps_operator.py index 230f7f4..b2c6a09 100644 --- a/src/tr_ap_xps/pipeline/xps_operator.py +++ b/src/tr_ap_xps/pipeline/xps_operator.py @@ -1,8 +1,8 @@ import asyncio import logging -from arroyo.operator import Operator -from arroyo.schemas import Message +from arroyopy.operator import Operator +from arroyopy.schemas import Message from ..schemas import DataFrameModel, XPSRawEvent, XPSResultStop, XPSStart, XPSStop from ..timing import timer diff --git a/src/tr_ap_xps/schemas.py b/src/tr_ap_xps/schemas.py index fb84315..fc3de08 100644 --- a/src/tr_ap_xps/schemas.py +++ b/src/tr_ap_xps/schemas.py @@ -2,7 +2,14 @@ from pydantic import BaseModel, Field -from arroyo.schemas import DataFrameModel, Event, Message, NumpyArrayModel, Start, Stop +from arroyopy.schemas import ( + DataFrameModel, + Event, + Message, + NumpyArrayModel, + Start, + Stop, +) """ This module defines schemas for XPS (X-ray Photoelectron Spectroscopy) messages and events using diff --git a/src/tr_ap_xps/tiled.py b/src/tr_ap_xps/tiled.py index f39b6dc..38095b3 100644 --- a/src/tr_ap_xps/tiled.py +++ b/src/tr_ap_xps/tiled.py @@ -11,7 +11,7 @@ from tiled.structures.data_source import DataSource from tiled.structures.table import TableStructure -from arroyo.publisher import Publisher +from arroyopy.publisher import Publisher from .config import settings from .schemas import XPSResult, XPSResultStop, XPSStart diff --git a/src/tr_ap_xps/websockets.py b/src/tr_ap_xps/websockets.py index cb6bce4..c6ec6a1 100644 --- a/src/tr_ap_xps/websockets.py +++ b/src/tr_ap_xps/websockets.py @@ -8,7 +8,7 @@ import pandas as pd import websockets -from arroyo.publisher import Publisher +from arroyopy.publisher import Publisher from .schemas import XPSResult, XPSResultStop, XPSStart