Update requirements

bluesky-queueserver/dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye
+FROM debian:trixie
 RUN apt update
 RUN apt install git -y
 RUN apt install librdkafka-dev -y

hwproxy/dockerfile

@@ -1,14 +1,22 @@
-FROM debian:bullseye
+FROM debian:trixie
 
 # python
 RUN apt update
 RUN apt install git -y
 RUN apt install librdkafka-dev -y
 RUN apt install python3-pip -y
+RUN apt install python3-venv -y
 
 # happi
 COPY ./happi.ini /happi.ini
 COPY ./requirements.txt ./
+
+# Create a virtual environment
+RUN python3 -m venv /opt/venv
+
+# Activate the virtual environment
+ENV PATH="/opt/venv/bin:$PATH"
+
 RUN pip install -r requirements.txt
 
 ENV HAPPI_CFG /happi.ini

hwproxy/requirements.txt

@@ -1,9 +1,9 @@
 bluesky==1.10.0
-pint==0.19.2
-numpy==1.26.4
-attune==0.4.4
-happi==1.14.0
-yaqc-bluesky==2022.4.1
-bluesky-queueserver==0.0.16
-wright-plans==2022.7.0
-bluesky-hwproxy==2022.8.0
+pint
+numpy
+attune
+happi
+yaqc-bluesky
+bluesky-queueserver
+wright-plans
+bluesky-hwproxy

re-manager/dockerfile

@@ -1,10 +1,11 @@
-FROM debian:bullseye
+FROM debian:bookworm
 
 # python
 RUN apt update
 RUN apt install git -y
 RUN apt install librdkafka-dev -y
 RUN apt install python3-pip -y
+RUN apt install python3-venv -y
 
 COPY ./databroker-config.yml /usr/local/share/intake/catalog.yml
 COPY ./happi.ini /happi.ini
@@ -13,6 +14,13 @@ COPY ./start_re.sh ./start_re.sh
 COPY ./user_group_permissions.yaml ./user_group_permissions.yaml
 COPY ./requirements.txt /requirements.txt
 
+# Create a virtual environment
+RUN python3 -m venv /opt/venv
+
+# Activate the virtual environment
+ENV PATH="/opt/venv/bin:$PATH"
+
+# Install dependencies
 RUN python3 -m pip install -r requirements.txt
 
 ENV PYTHONUNBUFFERED 1

re-manager/requirements.txt

@@ -1,8 +1,8 @@
+attune
 bluesky==1.10.0
-pint==0.19.2
-numpy==1.26.4
-attune==0.4.4
-happi==1.14.0
-yaqc-bluesky==2022.4.1
-bluesky-queueserver==0.0.16
-wright-plans==2022.7.0
+bluesky-queueserver==0.0.20
+happi
+numpy
+pint
+wright-plans
+yaqc-bluesky

re-manager/start_re.sh

@@ -1,5 +1,4 @@
 #! /bin/sh
 
 qserver-list-plans-devices --startup-script startup.py
-/usr/local/bin/start-re-manager --databroker-config=mongo --startup-script=./startup.py --existing-plans-devices=./existing_plans_and_devices.yaml --user-group-permissions=./user_group_permissions.yaml --zmq-data-proxy-addr zmq-proxy:5567 --redis-addr redis:6379 --zmq-publish-console ON
-
+start-re-manager --databroker-config=mongo --startup-script=./startup.py --existing-plans-devices=./existing_plans_and_devices.yaml --user-group-permissions=./user_group_permissions.yaml --zmq-data-proxy-addr zmq-proxy:5567 --redis-addr redis:6379 --zmq-publish-console ON

slack/dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-bullseye
+FROM python:3.12-trixie
 COPY ./requirements.txt ./
 RUN python3 -m pip install -r requirements.txt
 COPY ./slack_bot.py ./

slack/requirements.txt

@@ -1,5 +1,5 @@
 bluesky==1.10.0
-pyzmq==23.2.0
+pyzmq
 slack_sdk
 slack_bolt
 aiohttp

wt5/dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-bullseye
+FROM python:3.12-trixie
 COPY ./requirements.txt ./
 RUN python3 -m pip install -r requirements.txt
 COPY ./wt5_event_model.py ./

wt5/requirements.txt

@@ -1,5 +1,5 @@
 bluesky==1.10.0
-WrightTools==3.4.6
-pyzmq==23.2.0
-numpy==1.23.1
-toolz==0.12.0
+WrightTools
+pyzmq
+numpy
+toolz

zmq-proxy/dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-bullseye
+FROM python:3.12-trixie
 COPY ./requirements.txt ./
 RUN python3 -m pip install -r requirements.txt
 CMD ["bluesky-0MQ-proxy", "5567", "5568"]

zmq-proxy/requirements.txt

@@ -1,2 +1,2 @@
 bluesky==1.10.0
-pyzmq==23.2.0
+pyzmq