Skip to content

Commit

Permalink
Merge pull request #328 from ZLLentz/fix_pmpsdb_client
Browse files Browse the repository at this point in the history
FIX: pmpsdb_client didn't get updated
  • Loading branch information
ZLLentz authored Apr 23, 2024
2 parents d5b0994 + 7f2fdb6 commit 640aca4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion envs/pcds/conda-packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ pcdswidgets>=0.8.3
periodictable>=1.5.2
pipdeptree>=2.18.1
pmgr>=2.1.2
pmpsdb_client>=1.2.0
pre-commit>=3.7.0
psdaq-control-minimal>=3.3.38
psdm_qs_cli>=0.3.7
Expand Down Expand Up @@ -89,7 +90,7 @@ scikit-image>=0.19.3
scikit-learn>=1.2.2
scipy>=1.10.1
seaborn>=0.12.2
shellcheck>=0.9.0
shellcheck>=0.10.0
simplejson>=3.19.1
spyder-kernels>=2.4.3
suitcase-csv>=0.3.0
Expand Down
6 changes: 4 additions & 2 deletions envs/pcds/env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ dependencies:
- execnet=2.0.2=pyhd8ed1ab_0
- executing=1.2.0=pyhd8ed1ab_0
- expat=2.5.0=hcb278e6_1
- fabric=3.2.2=pyhd8ed1ab_0
- fastapi=0.110.1=pyhd8ed1ab_1
- fasteners=0.17.3=pyhd8ed1ab_0
- ffmpeg=6.0.0=gpl_h334edf3_105
Expand Down Expand Up @@ -236,6 +237,7 @@ dependencies:
- importlib_resources=6.1.0=pyhd8ed1ab_0
- iniconfig=2.0.0=pyhd8ed1ab_0
- intake=0.6.4=pyhd8ed1ab_0
- invoke=2.2.0=pyhd8ed1ab_0
- ipykernel=6.25.2=pyh2140261_0
- ipython=8.4.0=pyh41d4057_1
- ipython_genutils=0.2.0=py_1
Expand Down Expand Up @@ -522,6 +524,7 @@ dependencies:
- pluggy=1.4.0=pyhd8ed1ab_0
- ply=3.11=py_1
- pmgr=2.1.2=pyhd8ed1ab_0
- pmpsdb_client=1.2.0=py_0
- portaudio=19.6.0=h7c63dc7_9
- pre-commit=3.7.0=pyha770c72_0
- prettytable=3.9.0=pyhd8ed1ab_0
Expand Down Expand Up @@ -662,7 +665,7 @@ dependencies:
- setuptools=68.2.2=pyhd8ed1ab_0
- setuptools-scm=8.0.4=pyhd8ed1ab_0
- setuptools_dso=2.9=pyhd8ed1ab_0
- shellcheck=0.9.0=ha770c72_0
- shellcheck=0.10.0=ha770c72_0
- shellingham=1.5.3=pyhd8ed1ab_0
- simplejson=3.19.2=py39hd1e30aa_0
- sip=6.7.11=py39h3d6467e_1
Expand Down Expand Up @@ -843,7 +846,6 @@ dependencies:
- pip-api==0.0.30
- pip-audit==2.6.1
- pip-requirements-parser==32.0.1
- pmpsdb-client==1.1.2
- git+https://github.com/pcdshub/[email protected]
- pvxslibs==1.2.3
- py-serializable==0.11.1
Expand Down
1 change: 0 additions & 1 deletion envs/pcds/pip-packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ laserbeamsize
ophyd-async>=0.2.0
p4p
pip-audit
pmpsdb-client>=1.1.2
PyQt5-stubs>=5.15.6
python-vxi11
slac-alarm-manager>=1.3.0
Expand Down
2 changes: 1 addition & 1 deletion scripts/release_notes_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
'pcdsdevices',
'pcdsutils',
'pcdswidgets',
'pmpsdb-client',
'pmpsdb_client',
'pmpsui',
'pmgr',
'psdaq-control-minimal',
Expand Down

0 comments on commit 640aca4

Please sign in to comment.