Skip to content

Commit

Permalink
Merge pull request #144 from ZLLentz/rel-3.4.0
Browse files Browse the repository at this point in the history
Rel 3.4.0
  • Loading branch information
ZLLentz authored Oct 8, 2020
2 parents 5b14276 + 58ebdd4 commit fe84447
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 52 deletions.
12 changes: 6 additions & 6 deletions envs/pcds/conda-packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ flake8
h5py
happi>=1.7.2
holoviews>=1.10.9
hutch-python>=1.5.0
hxrsnd>=0.1.7
hutch-python>=1.6.1
hxrsnd>=0.2.0
ipython>=7.1
jupyter
lightpath>=0.6.5
line_profiler
lucid>=0.7.1
lucid>=0.7.2
lxml
mysqlclient
numpy>=1.14
Expand All @@ -32,8 +32,8 @@ pandas
panel
papermill
pcaspy
pcdsdaq>=2.2.7
pcdsdevices>=2.11.0
pcdsdaq>=2.3.0
pcdsdevices>=3.0.0
pcdsutils>=0.3.1
pcdswidgets>=0.4.2
periodictable
Expand All @@ -43,7 +43,7 @@ psdm_qs_cli>=0.3.1
pswalker>=1.0.5
pyaudio
pyca>=3.1.1
pydm>=1.10.4
pydm>=1.10.6
pyepics>=3.4.3
pyfiglet
pymongo
Expand Down
93 changes: 47 additions & 46 deletions envs/pcds/env.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pcds-3.3.5
name: pcds-3.4.0
channels:
- pcds-tag
- conda-forge
Expand All @@ -13,7 +13,7 @@ dependencies:
- appdirs=1.4.3
- archapp=1.0.0
- argon2-cffi=20.1.0
- arrow=0.16.0
- arrow=0.17.0
- asciitree=0.3.3
- asteval=0.9.16
- async_generator=1.10
Expand All @@ -25,7 +25,7 @@ dependencies:
- backcall=0.2.0
- backports=1.0
- backports.functools_lru_cache=1.6.1
- beautifulsoup4=4.9.1
- beautifulsoup4=4.9.3
- binaryornot=0.4.4
- black=20.8b1
- bleach=3.2.1
Expand Down Expand Up @@ -55,22 +55,22 @@ dependencies:
- colorcet=2.0.1
- coloredlogs=14.0
- conda=4.8.5
- conda-build=3.20.2
- conda-forge-pinning=2020.09.19.20.20.14
- conda-build=3.20.3
- conda-forge-pinning=2020.10.08.15.13.14
- conda-pack=0.5.0
- conda-package-handling=1.7.0
- conda-smithy=3.7.10
- conda-smithy=3.8.0
- contextlib2=0.5.5
- contextvars=2.4
- cookiecutter=1.7.2
- coverage=5.3
- cryptography=3.1
- cryptography=3.1.1
- curio=1.4
- curl=7.71.1
- cycler=0.10.0
- cytoolz=0.10.1
- dask=2.27.0
- dask-core=2.27.0
- cytoolz=0.11.0
- dask=2.30.0
- dask-core=2.30.0
- databroker=1.1.0
- dataclasses=0.7
- datashader=0.11.1
Expand All @@ -80,12 +80,12 @@ dependencies:
- defusedxml=0.6.0
- deprecated=1.2.10
- distlib=0.3.1
- distributed=2.27.0
- distributed=2.30.0
- docopt=0.6.2
- doct=1.1.0
- doctr=1.8.0
- docutils=0.16
- dpkt=1.9.3
- dpkt=1.9.4
- editdistance=0.5.3
- elog=0.1.2
- entrypoints=0.3
Expand All @@ -97,7 +97,7 @@ dependencies:
- fasteners=0.14.1
- ffmpeg=4.2.3
- filelock=3.0.12
- flake8=3.8.3
- flake8=3.8.4
- font-ttf-dejavu-sans-mono=2.37
- font-ttf-inconsolata=2.001
- font-ttf-source-code-pro=2.030
Expand All @@ -107,39 +107,39 @@ dependencies:
- fonts-conda-forge=1
- freetype=2.10.2
- fribidi=1.0.10
- fsspec=0.8.2
- fsspec=0.8.3
- future=0.18.2
- fuzzywuzzy=0.17.0
- gdk-pixbuf=2.38.2
- gettext=0.19.8.1
- giflib=5.2.1
- git=2.28.0
- gitdb=4.0.5
- gitpython=3.1.8
- glib=2.66.0
- gitpython=3.1.9
- glib=2.66.1
- glob2=0.7
- gmp=6.2.0
- gnutls=3.6.13
- gobject-introspection=1.64.1
- gobject-introspection=1.66.1
- graphite2=1.3.13
- graphviz=2.42.3
- gst-plugins-base=1.14.5
- gstreamer=1.14.5
- gtk2=2.24.32
- gts=0.7.6
- h5py=2.10.0
- happi=1.7.2
- happi=1.8.0
- harfbuzz=2.4.0
- hdf5=1.10.6
- heapdict=1.0.1
- historydict=1.2.3
- holoviews=1.13.4
- humanfriendly=8.2
- humanize=2.6.0
- hutch-python=1.5.0
- hxrsnd=0.1.7
- humanize=3.0.1
- hutch-python=1.6.1
- hxrsnd=0.2.0
- icu=64.2
- identify=1.5.3
- identify=1.5.5
- idna=2.10
- imagecodecs=2020.5.30
- imageio=2.9.0
Expand All @@ -159,14 +159,14 @@ dependencies:
- jedi=0.17.2
- jinja2=2.11.2
- jinja2-time=0.2.0
- joblib=0.16.0
- joblib=0.17.0
- jpeg=9d
- jsonschema=3.2.0
- jupyter=1.0.0
- jupyter_client=6.1.7
- jupyter_console=6.2.0
- jupyter_core=4.6.3
- jupyterlab_pygments=0.1.1
- jupyterlab_pygments=0.1.2
- jxrlib=1.1
- kiwisolver=1.2.0
- krb5=1.17.1
Expand All @@ -176,17 +176,18 @@ dependencies:
- ld_impl_linux-64=2.35
- lerc=2.2
- libaec=1.0.4
- libarchive=3.3.3
- libarchive=3.4.3
- libblas=3.8.0
- libcblas=3.8.0
- libclang=9.0.1
- libcurl=7.71.1
- libdb=6.1.26
- libdb=6.2.32
- libedit=3.1.20191231
- libev=4.33
- libffi=3.2.1
- libgcc-ng=9.3.0
- libgfortran-ng=7.5.0
- libgfortran4=7.5.0
- libgomp=9.3.0
- libiconv=1.16
- liblapack=3.8.0
Expand Down Expand Up @@ -217,11 +218,11 @@ dependencies:
- llvmlite=0.34.0
- lmfit=1.0.1
- locket=0.2.0
- lucid=0.7.1
- lucid=0.7.2
- lxml=4.5.2
- lz4-c=1.9.2
- lzo=2.10
- markdown=3.2.2
- markdown=3.3
- markupsafe=1.1.1
- matplotlib=2.2.5
- matplotlib-base=2.2.5
Expand All @@ -231,18 +232,18 @@ dependencies:
- mongoquery=1.3.5
- monotonic=1.5
- more-itertools=8.5.0
- msgpack-numpy=0.4.7
- msgpack-numpy=0.4.7.1
- msgpack-python=1.0.0
- msrest=0.6.19
- multipledispatch=0.6.0
- mypy_extensions=0.4.3
- mysql=5.5.24
- mysqlclient=1.3.12
- nbclient=0.5.0
- nbconvert=6.0.4
- nbconvert=6.0.7
- nbformat=5.0.7
- ncurses=6.2
- nest-asyncio=1.4.0
- nest-asyncio=1.4.1
- netifaces=0.10.9
- nettle=3.4.1
- networkx=2.5
Expand All @@ -260,25 +261,25 @@ dependencies:
- opencv=4.2.0
- openh264=2.1.1
- openjpeg=2.3.1
- openssl=1.1.1g
- openssl=1.1.1h
- ophyd=1.5.3
- outcome=1.0.1
- packaging=20.4
- pandas=1.1.2
- pandas=1.1.3
- pandoc=2.10.1
- pandocfilters=1.4.2
- panel=0.9.7
- pango=1.42.4
- papermill=2.1.2
- papermill=2.2.0
- param=1.9.3
- parso=0.7.1
- partd=1.1.0
- patchelf=0.11
- pathspec=0.8.0
- patsy=0.5.1
- pcaspy=0.7.1
- pcdsdaq=2.2.7
- pcdsdevices=2.11.0
- pcdsdaq=2.3.0
- pcdsdevices=3.0.0
- pcdsutils=0.3.1
- pcdswidgets=0.4.2
- pcre=8.44
Expand All @@ -288,7 +289,7 @@ dependencies:
- pickleshare=0.7.5
- pillow=7.2.0
- pims=0.5
- pint=0.16
- pint=0.16.1
- pip=20.2.3
- pixman=0.38.0
- pkginfo=1.5.0.1
Expand Down Expand Up @@ -319,7 +320,7 @@ dependencies:
- pycrypto=2.6.1
- pyct=0.4.6
- pyct-core=0.4.6
- pydm=1.10.4
- pydm=1.10.6
- pyepics=3.4.3
- pyfiglet=0.8.post1
- pyflakes=2.2.0
Expand All @@ -342,7 +343,7 @@ dependencies:
- pytest-timeout=1.4.2
- python=3.6.11
- python-dateutil=2.8.1
- python-graphviz=0.14.1
- python-graphviz=0.14.2
- python-levenshtein=0.12.0
- python-libarchive-c=2.9
- python-slugify=4.0.1
Expand All @@ -355,12 +356,12 @@ dependencies:
- pyzmq=19.0.2
- qdarkstyle=2.5.4
- qt=5.12.5
- qtawesome=0.7.2
- qtawesome=1.0.1
- qtconsole=4.7.7
- qtpy=1.9.0
- qtpyinheritance=0.0.1
- readline=8.0
- regex=2020.7.14
- regex=2020.9.27
- requests=2.24.0
- requests-oauthlib=1.3.0
- ripgrep=12.1.1
Expand Down Expand Up @@ -410,9 +411,9 @@ dependencies:
- timechart=1.2.3
- tk=8.6.10
- toml=0.10.1
- toolz=0.10.0
- toolz=0.11.1
- tornado=6.0.4
- tqdm=4.49.0
- tqdm=4.50.2
- traitlets=4.3.3
- transfocate=0.3.3
- trio=0.17.0
Expand Down Expand Up @@ -450,14 +451,14 @@ dependencies:
- xz=5.2.5
- yaml=0.2.5
- zarr=2.4.0
- zeromq=4.3.2
- zeromq=4.3.3
- zfp=0.5.5
- zict=2.0.0
- zipp=3.1.0
- zipp=3.3.0
- zlib=1.2.11
- zstd=1.4.5
- pip:
- pyqt5-sip==4.19.18
- pyqtchart==5.12
- pyqtwebengine==5.12.1
prefix: /u1/zlentz/miniconda3/envs/pcds-3.3.5
prefix: /u1/zlentz/miniconda3/envs/pcds-3.4.0

0 comments on commit fe84447

Please sign in to comment.