Merge pull request #98 from ken-lauer/ref_subprocess_fifo

REF: unnamed pipe -> named pipe (FIFO) for SubprocessTao
bmad-sim · Oct 1, 2024 · d0b65c5 · d0b65c5
2 parents 0959073 + e194cf1
commit d0b65c5
Show file tree

Hide file tree

Showing 8 changed files with 364 additions and 99 deletions.
diff --git a/.github/actions/conda-setup/action.yml b/.github/actions/conda-setup/action.yml
@@ -11,7 +11,7 @@ runs:
     - name: Setup Mambaforge
       uses: conda-incubator/setup-miniconda@v3
       with:
-        miniforge-variant: Mambaforge
+        miniforge-version: latest
         activate-environment: pytao-dev
         use-mamba: true
         channels: conda-forge

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    name: ${{ matrix.os }} Python ${{ matrix.python-version }}
+    name: ${{ matrix.os }} Python ${{ matrix.python-version }} (reuse=${{ matrix.subprocess-reuse }})
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -18,6 +18,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         python-version: ["3.9", "3.10", "3.11", "3.12"]
+        subprocess-reuse: ["0", "1"]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -37,6 +38,7 @@ jobs:
       - name: Run Tests
         shell: bash -l {0}
         run: |
+          export TAO_REUSE_SUBPROCESS=${{ matrix.subprocess-reuse }}
           echo -e '## Test results\n\n```' >> "$GITHUB_STEP_SUMMARY"
           pytest -v --cov=pytao/ pytao/tests 2>&1 | tee -a "$GITHUB_STEP_SUMMARY"
           echo '```' >> "$GITHUB_STEP_SUMMARY"
diff --git a/pytao/plotting/mpl.py b/pytao/plotting/mpl.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import functools
 import logging
 import pathlib
 import time
@@ -15,7 +16,6 @@
 import matplotlib.text
 import matplotlib.ticker
 import numpy as np
-from pandas.core.frame import functools
 
 from . import floor_plan_shapes, layout_shapes, pgplot
 from .curves import PlotCurveLine, PlotCurveSymbols, PlotHistogram, TaoCurveSettings