Skip to content

Commit

Permalink
Merge pull request #106 from ZLLentz/rel-3.1.0
Browse files Browse the repository at this point in the history 
ENH: Rel 3.1.0
  • Loading branch information
@ZLLentz
ZLLentz authored Feb 6, 2020
2 parents b25e4c9 + 7cdeaa1 commit 0fd3493
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 61 deletions.
18 changes: 9 additions & 9 deletions envs/pcds/conda-packages.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ flake8
h5py
happi>=1.2.1
holoviews>=1.10.9
hutch-python>=1.0.2
hxrsnd>=0.1.4
hutch-python>=1.1.1
hxrsnd>=0.1.5
ipython>=7.1
jupyter
lightpath>=0.5.2
lightpath>=0.6.0
lxml
mysqlclient
numpy>=1.14
opencv
ophyd>=1.3.1
ophyd>1.3
pandas
panel
papermill
pcaspy
pcdsdaq>=2.2.1
pcdsdevices>=2.1.0
pcdswidgets
pcdsdaq>=2.2.2
pcdsdevices>=2.3.0
pcdswidgets>=0.3.0
periodictable
pmgr
psdm_qs_cli
Expand All @@ -43,7 +43,7 @@ pytest<4
pytest-qt
pytest-timeout
python-graphviz
pytmc>=2.1.0
pytmc>=2.5.0
qdarkstyle
scikit-image
scipy
Expand All @@ -54,6 +54,6 @@ sphinx_rtd_theme
timechart
tornado<5.0.0
transfocate
typhos
typhos>=0.6.0
versioneer
xarray
104 changes: 52 additions & 52 deletions envs/pcds/env.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pcds-3.0.1
name: pcds-3.1.0
channels:
- pcds-tag
- defaults
Expand Down Expand Up @@ -27,7 +27,7 @@ dependencies:
- bokeh=1.4.0
- boltons=20.0.0
- bzip2=1.0.8
- ca-certificates=2019.11.27
- ca-certificates=2020.1.1
- cairo=1.14.12
- caproto=0.4.0
- certifi=2019.11.28
Expand All @@ -49,22 +49,22 @@ dependencies:
- dask=1.1.4
- dask-core=1.1.4
- databroker=0.13.3
- datashader=0.9.0
- datashader=0.10.0
- datashape=0.5.4
- dbus=1.13.12
- decorator=4.4.1
- defusedxml=0.6.0
- distributed=1.26.0
- docopt=0.6.2
- doct=1.0.5
- doct=1.1.0
- doctr=1.8.0
- docutils=0.15.2
- docutils=0.16
- elog=0.1.2
- entrypoints=0.3
- enum34=1.1.6
- epics-base=3.14.12.6
- epics-pypdb=0.1.4
- event-model=1.13.0
- event-model=1.13.2
- expat=2.2.6
- ffmpeg=4.0
- flake8=3.7.9
Expand All @@ -88,22 +88,24 @@ dependencies:
- holoviews=1.12.7
- humanfriendly=4.18
- humanize=0.5.1
- hutch-python=1.1.0
- hxrsnd=0.1.4
- hutch-python=1.1.1
- hxrsnd=0.1.5
- icu=58.2
- idna=2.8
- imagecodecs-lite=2019.12.3
- imageio=2.6.1
- imagesize=1.2.0
- importlib_metadata=1.3.0
- importlib_metadata=1.5.0
- inflect=4.1.0
- intel-openmp=2019.4
- ipykernel=5.1.3
- ipython=7.11.1
- ipykernel=5.1.4
- ipython=7.12.0
- ipython_genutils=0.2.0
- ipywidgets=7.5.1
- jaraco.itertools=5.0.0
- jasper=2.0.14
- jedi=0.15.2
- jinja2=2.10.3
- jedi=0.16.0
- jinja2=2.11.1
- jinja2-time=0.2.0
- jpeg=9b
- jsonschema=3.2.0
Expand Down Expand Up @@ -135,7 +137,7 @@ dependencies:
- llvmlite=0.31.0
- lmfit=1.0.0
- locket=0.2.0
- lxml=4.4.2
- lxml=4.5.0
- lz4-c=1.8.1.2
- lzo=2.10
- markdown=3.1.1
Expand All @@ -148,49 +150,48 @@ dependencies:
- mkl_fft=1.0.15
- mkl_random=1.1.0
- mongoquery=1.3.5
- more-itertools=8.0.2
- more-itertools=8.2.0
- msgpack-python=0.6.1
- multipledispatch=0.6.0
- mysql=5.5.24
- mysqlclient=1.3.12
- nbconvert=5.6.1
- nbformat=4.4.0
- nbformat=5.0.4
- ncurses=6.1
- netifaces=0.10.9
- networkx=2.4
- notebook=5.7.8
- numba=0.47.0
- numexpr=2.7.0
- numpy=1.16.5
- numpy-base=1.16.5
- numba=0.48.0
- numexpr=2.7.1
- numpy=1.16.6
- numpy-base=1.16.6
- numpydoc=0.9.2
- olefile=0.46
- opencv=3.4.2
- openssl=1.1.1d
- ophyd=1.3.3
- packaging=20.0
- pandas=0.25.3
- ophyd=1.4.0rc4
- packaging=20.1
- pandas=1.0.0
- pandoc=2.2.3.2
- pandocfilters=1.4.2
- panel=0.7.0
- panel=0.8.0
- pango=1.42.4
- papermill=1.2.1
- param=1.9.2
- parso=0.5.2
- param=1.9.3
- parso=0.6.0
- partd=1.1.0
- pathlib=1.0.1
- patsy=0.5.1
- pcaspy=0.7.1
- pcdsdaq=2.2.2
- pcdsdevices=2.2.0
- pcdsdevices=2.3.0
- pcdswidgets=0.3.0
- pcre=8.43
- periodictable=1.5.2
- pexpect=4.7.0
- pexpect=4.8.0
- pickleshare=0.7.5
- pillow=7.0.0
- pims=0.4.1
- pip=19.3.1
- pip=20.0.2
- pixman=0.38.0
- pluggy=0.13.1
- ply=3.11
Expand All @@ -199,10 +200,10 @@ dependencies:
- poyo=0.5.0
- prettytable=0.7.2
- prometheus_client=0.7.1
- prompt_toolkit=3.0.2
- prompt_toolkit=3.0.3
- psdm_qs_cli=0.2.9
- psutil=5.6.7
- pswalker=1.0.1
- pswalker=1.0.3
- ptyprocess=0.6.0
- py=1.8.1
- py-opencv=3.4.2
Expand All @@ -222,7 +223,7 @@ dependencies:
- pyparsing=2.4.6
- pyqt=5.6.0
- pyqtgraph=0.10.0
- pyrsistent=0.15.6
- pyrsistent=0.15.7
- pysocks=1.7.1
- pytables=3.4.4
- pytest=3.10.1
Expand All @@ -233,25 +234,25 @@ dependencies:
- python-graphviz=0.13.2
- pytmc=2.5.0
- pytz=2019.3
- pyviz_comms=0.7.2
- pyviz_comms=0.7.3
- pywavelets=1.1.1
- pyyaml=5.2
- pyzmq=18.1.0
- pyyaml=5.3
- pyzmq=18.1.1
- qdarkstyle=2.5.4
- qt=5.6.3
- qtawesome=0.6.0
- qtawesome=0.6.1
- qtconsole=4.6.0
- qtpy=1.9.0
- readline=7.0
- requests=2.22.0
- scikit-image=0.15.0
- scipy=1.3.2
- seaborn=0.9.0
- scikit-image=0.16.2
- scipy=1.4.1
- seaborn=0.10.0
- send2trash=1.5.0
- setuptools=44.0.0
- setuptools=45.1.0
- simplejson=3.17.0
- sip=4.18.1
- six=1.13.0
- six=1.14.0
- slicerator=1.0.0
- snappy=1.1.7
- snowballstemmer=2.0.0
Expand All @@ -264,8 +265,7 @@ dependencies:
- sphinxcontrib-jsmath=1.0.1
- sphinxcontrib-qthelp=1.0.2
- sphinxcontrib-serializinghtml=1.1.3
- sqlite=3.30.1
- statsmodels=0.10.1
- sqlite=3.31.1
- super_state_machine=2.0.2
- tblib=1.6.0
- tenacity=6.0.0
Expand All @@ -277,27 +277,27 @@ dependencies:
- tk=8.6.8
- toolz=0.10.0
- tornado=4.5.3
- tqdm=4.41.1
- tqdm=4.42.0
- traitlets=4.3.3
- transfocate=0.3.2
- typhos=0.6.0
- tzlocal=2.0.0
- udunits2=2.2.27.6
- ujson=1.35
- uncertainties=3.1.3
- urllib3=1.25.7
- uncertainties=3.1.2
- urllib3=1.25.8
- versioneer=0.18
- wcwidth=0.1.7
- wcwidth=0.1.8
- webencodings=0.5.1
- wheel=0.33.6
- wheel=0.34.2
- whichcraft=0.6.1
- widgetsnbextension=3.5.1
- xarray=0.14.1
- xarray=0.15.0
- xz=5.2.4
- yaml=0.1.7
- zeromq=4.3.1
- zict=1.0.0
- zipp=0.6.0
- zipp=2.1.0
- zlib=1.2.11
- zstd=1.3.7
prefix: /u1/zlentz/miniconda/envs/pcds-3.0.1
prefix: /u1/zlentz/miniconda/envs/pcds-3.1.0

0 comments on commit 0fd3493

Please sign in to comment.