Skip to content

Commit

Permalink
Merge pull request #185 from ZLLentz/rel-4.1.0
Browse files Browse the repository at this point in the history
ENH: pcds-4.1.0
  • Loading branch information
ZLLentz authored Apr 7, 2021
2 parents bfb5f23 + 78d942d commit c82f93f
Show file tree
Hide file tree
Showing 2 changed files with 147 additions and 118 deletions.
23 changes: 12 additions & 11 deletions envs/pcds/conda-packages.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
ads-async>=0.0.2
ads-async>=0.1.0
anaconda-client
bluesky>=1.6.7
bluesky-live
bokeh>=1.0.1
caproto>=0.7.1
caproto>=0.8.0
coloredlogs
conda-pack
conda-smithy
cookiecutter
coverage
databroker>=1.2.2
databroker>=1.2.3
datashader
doctr
docutils=0.16
elog>=1.0.2
epicscorelibs=7.0.3.99.4.0
flake8
Expand Down Expand Up @@ -40,9 +41,9 @@ panel
papermill
pcaspy
pcdscalc>=0.2.0
pcdsdaq>=2.3.3
pcdsdevices>=4.2.0
pcdsutils>=0.4.1
pcdsdaq>=2.3.4
pcdsdevices>=4.3.2
pcdsutils>=0.4.2
pcdswidgets>=0.5.1
periodictable
pmgr>=1.1.4
Expand All @@ -52,7 +53,7 @@ psdm_qs_cli>=0.3.1
pswalker>=1.0.6
pyaudio
pyca>=3.1.1
pydm>=1.10.7
pydm>=1.11.0
pyepics>=3.4.3
pyfiglet
pymongo
Expand All @@ -64,7 +65,7 @@ pytest-qt
pytest-timeout
python-graphviz
python-ldap
pytmc>=2.8.1
pytmc>=2.9.0
qdarkstyle
scikit-image
scikit-learn
Expand All @@ -75,9 +76,9 @@ simplejson
sphinx
sphinx_rtd_theme
tc_release>=0.2.1
timechart>=1.2.3
transfocate>=0.3.4
typhos>=1.1.4
timechart>=1.2.4
transfocate>=0.5.0
typhos>=1.1.6
versioneer
xarray
xraylib
Loading

0 comments on commit c82f93f

Please sign in to comment.