Skip to content

Commit

Permalink
Merge pull request #157 from ZLLentz/rel-3.5.0
Browse files Browse the repository at this point in the history
ENH: pcds-3.5.0
  • Loading branch information
ZLLentz authored Dec 24, 2020
2 parents 249a9a5 + f1b173a commit a13ef14
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 105 deletions.
24 changes: 13 additions & 11 deletions envs/pcds/conda-packages.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
anaconda-client
bluesky>=1.6.7
bokeh>=1.0.1
caproto>=0.6.0
caproto>=0.7.0
coloredlogs
conda-pack
conda-smithy
Expand All @@ -15,29 +15,30 @@ epicscorelibs=7.0.3.99.1.0
flake8
fzf
gh
grpcio-tools
h5py
happi>=1.8.3
holoviews>=1.10.9
hutch-python>=1.8.0
hxrsnd>=0.2.1
hutch-python>=1.9.0
hxrsnd>=0.2.2
ipython>=7.1
jupyter
lightpath>=0.6.5
lightpath>=0.6.6
line_profiler
lucid>=0.7.2
lxml
mysqlclient
nabs>=0.1.0
nabs>=1.0.0
numpy>=1.14
opencv
ophyd>=1.5.4
ophyd>=1.6.0
pandas
panel
papermill
pcaspy
pcdscalc>=0.1.0
pcdsdaq>=2.3.0
pcdsdevices>=3.3.0
pcdscalc>=0.2.0
pcdsdaq>=2.3.1
pcdsdevices>=4.0.0
pcdsutils>=0.4.0
pcdswidgets>=0.4.2
periodictable
Expand All @@ -57,7 +58,7 @@ pytest-benchmark
pytest-qt
pytest-timeout
python-graphviz
pytmc>=2.7.7
pytmc>=2.8.0
qdarkstyle
scikit-image
scikit-learn
Expand All @@ -68,6 +69,7 @@ sphinx
sphinx_rtd_theme
timechart>=1.2.3
transfocate>=0.3.3
typhos>=1.1.1
typhos>=1.1.2
versioneer
xarray
xraylib
Loading

0 comments on commit a13ef14

Please sign in to comment.