Fix GitHub action for building docs

.github/workflows/docs.yml

@@ -26,6 +26,25 @@ jobs:
         # installation problems if out of date.
         python -m pip install --upgrade pip setuptools numpy
 
+        mkdir ~/repos
+        pushd ~/repos
+        echo $PWD
+
+        git clone https://github.com/bluesky/bluesky-queueserver.git
+        pushd bluesky-queueserver
+        pip install .
+        popd
+        echo $PWD
+
+        git clone https://github.com/bluesky/bluesky-httpserver.git
+        pushd bluesky-httpserver
+        pip install .
+        popd
+        echo $PWD
+
+        popd
+        echo $PWD
+
         pip install .
         pip install -r requirements-dev.txt
         pip list

.github/workflows/docs_publish.yml

@@ -22,9 +22,12 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+    - uses: shogo82148/actions-setup-redis@v1
+      with:
+        redis-version: "7.x"
     - name: Install dependencies
       run: |
-        sudo apt install redis
+        # sudo apt install redis
 
         # Versioneer uses the most recent git tag to generate __version__, which appears
         # in the published documentation.
@@ -35,6 +38,25 @@ jobs:
         # installation problems if out of date.
         python -m pip install --upgrade pip setuptools numpy
 
+        mkdir ~/repos
+        pushd ~/repos
+        echo $PWD
+
+        git clone https://github.com/bluesky/bluesky-queueserver.git
+        pushd bluesky-queueserver
+        pip install .
+        popd
+        echo $PWD
+
+        git clone https://github.com/bluesky/bluesky-httpserver.git
+        pushd bluesky-httpserver
+        pip install .
+        popd
+        echo $PWD
+
+        popd
+        echo $PWD
+
         pip install .
         pip install -r requirements-dev.txt
         pip list

.github/workflows/testing.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
         group: [1, 2, 3]
       fail-fast: false
 
@@ -20,9 +20,12 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+    - uses: shogo82148/actions-setup-redis@v1
+      with:
+        redis-version: "7.x"
     - name: Install dependencies
       run: |
-        sudo apt install redis
+        # sudo apt install redis
 
         # These packages are installed in the base environment but may be older
         # versions. Explicitly upgrade them because they often create

bluesky_queueserver_api/tests/test_api.py

@@ -4235,15 +4235,18 @@ def check_status(status, manager_state, worker_environment_exists):
         RM = instantiate_re_api_class(rm_api_class)
         assert RM.system_info_monitor.enabled is False
 
-        def _get_last_status():
+        def _get_last_status(timeout=10):
             st = None
+            t0 = ttime.time()
             while True:
                 try:
                     msg = RM.system_info_monitor.next_msg(timeout=0.1)
                     st = msg["msg"]["status"]
                 except RM.RequestTimeoutError:
                     if st is not None:
                         break
+                    if ttime.time() >= t0 + timeout:
+                        raise TimeoutError()
             return st
 
         if option == "single_enable":
@@ -4294,15 +4297,18 @@ async def testing():
             RM = instantiate_re_api_class(rm_api_class)
             assert RM.system_info_monitor.enabled is False
 
-            async def _get_last_status():
+            async def _get_last_status(timeout=10):
                 st = None
+                t0 = ttime.time()
                 while True:
                     try:
                         msg = await RM.system_info_monitor.next_msg(timeout=0.1)
                         st = msg["msg"]["status"]
                     except RM.RequestTimeoutError:
                         if st is not None:
                             break
+                        if ttime.time() >= t0 + timeout:
+                            raise TimeoutError()
                 return st
 
             if option == "single_enable":

docs/source/api-reference.rst

@@ -262,8 +262,8 @@ API for monitoring system info of RE Manager
 
 Each instance of ``REManagerAPI`` holds a reference to System Info Monitor. The monitor operates
 similary to the Console Monitor and allows to receive streamed system information in real time.
-The stream currently contains only messages with RE Manager *status*. Additional messages may be 
-added to the stream later. 
+The stream currently contains only messages with RE Manager *status*. Additional messages may be
+added to the stream later.
 
 .. autosummary::
    :nosignatures:

requirements.txt

@@ -1,3 +1,4 @@
 # List required packages in this file, one per line.
 bluesky-queueserver
+websockets
 httpx