Merge pull request #163 from ZLLentz/psdaq

ENH: add psdaq
pcdshub · Apr 1, 2021 · bfb5f23 · bfb5f23
2 parents 09ac49d + fe5aa1e
commit bfb5f23
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/condarc b/condarc
@@ -2,6 +2,7 @@
 channels:
   - conda-forge
   - pcds-tag
+  - lcls-ii
 
 # Stop at first channel with a valid version
 channel_priority: strict

diff --git a/envs/pcds/conda-packages.txt b/envs/pcds/conda-packages.txt
@@ -47,6 +47,7 @@ pcdswidgets>=0.5.1
 periodictable
 pmgr>=1.1.4
 pre-commit
+psdaq-control-minimal>=3.3.14
 psdm_qs_cli>=0.3.1
 pswalker>=1.0.6
 pyaudio

diff --git a/envs/pcds/keep-updated.txt b/envs/pcds/keep-updated.txt
@@ -17,6 +17,7 @@ pcdsdevices
 pcdsutils
 pcdswidgets
 pmgr
+psdaq-control-minimal
 psdm_qs_cli
 pswalker
 pyca