Skip to content

Commit

Permalink
Merge pull request #188 from ZLLentz/rel-4.1.3
Browse files Browse the repository at this point in the history
ENH: updated pcds to 4.1.3
  • Loading branch information
ZLLentz authored Apr 28, 2021
2 parents 35c6b8e + dcfc8fe commit adcebd2
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 43 deletions.
4 changes: 4 additions & 0 deletions deploy/hosts.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ mec-control
mec-daq
mfx-control
mfx-daq
rix-console
rix-control
rix-daq
rix-monitor
tmo-control
tmo-daq
xcs-control
Expand Down
10 changes: 5 additions & 5 deletions envs/pcds/conda-packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ databroker>=1.2.3
datashader
doctr
docutils=0.16
elog>=1.0.2
elog>=1.1.0
epicscorelibs=7.0.3.99.4.0
flake8
fzf
Expand All @@ -32,15 +32,15 @@ line_profiler
lucid>=0.7.2
lxml
mysqlclient
nabs>=1.1.1
nabs>=1.1.2
numpy>=1.14
opencv
ophyd>=1.6.1
pandas
panel
papermill
pcaspy
pcdscalc>=0.2.0
pcdscalc>=0.3.0
pcdsdaq>=2.3.4
pcdsdevices>=4.4.0
pcdsutils>=0.4.2
Expand All @@ -66,7 +66,7 @@ pytest-qt
pytest-timeout
python-graphviz
python-ldap
pytmc>=2.9.0
pytmc>=2.9.1
qdarkstyle
scikit-image
scikit-learn
Expand All @@ -78,7 +78,7 @@ sphinx
sphinx_rtd_theme
tc_release>=0.2.1
timechart>=1.2.4
transfocate>=0.5.0
transfocate=0.5.0
typhos>=1.1.6
versioneer
xarray
Expand Down
79 changes: 42 additions & 37 deletions envs/pcds/env.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pcds-4.1.2
name: pcds-4.1.3
channels:
- conda-forge
- pcds-tag
Expand All @@ -16,7 +16,7 @@ dependencies:
- appdirs=1.4.4
- archapp=1.0.0
- argon2-cffi=20.1.0
- arrow=1.0.3
- arrow=1.1.0
- asciitree=0.3.3
- asteval=0.9.23
- async_generator=1.10
Expand All @@ -28,7 +28,7 @@ dependencies:
- backports.functools_lru_cache=1.6.4
- beautifulsoup4=4.9.3
- binaryornot=0.4.4
- black=20.8b1
- black=21.4b0
- bleach=3.3.0
- blinker=1.4
- blosc=1.21.0
Expand All @@ -46,7 +46,7 @@ dependencies:
- ca-certificates=2020.12.5
- cached-property=1.5.2
- cached_property=1.5.2
- cachetools=4.2.1
- cachetools=4.2.2
- cairo=1.16.0
- caproto=0.8.0
- certifi=2020.12.5
Expand All @@ -62,10 +62,10 @@ dependencies:
- coloredlogs=15.0
- conda=4.10.1
- conda-build=3.21.4
- conda-forge-pinning=2021.04.15.09.30.17
- conda-forge-pinning=2021.04.28.12.37.37
- conda-pack=0.6.0
- conda-package-handling=1.7.3
- conda-smithy=3.10.0
- conda-smithy=3.10.1
- contextlib2=0.5.5
- cookiecutter=1.7.2
- coverage=5.5
Expand All @@ -76,8 +76,8 @@ dependencies:
- cyrus-sasl=2.1.27
- cython=0.29.23
- cytoolz=0.11.0
- dask=2021.4.0
- dask-core=2021.4.0
- dask=2021.4.1
- dask-core=2021.4.1
- databroker=1.2.3
- dataclasses=0.8
- datashader=0.12.1
Expand All @@ -87,14 +87,14 @@ dependencies:
- defusedxml=0.7.1
- deprecated=1.2.12
- distlib=0.3.1
- distributed=2021.4.0
- distributed=2021.4.1
- docopt=0.6.2
- doct=1.1.0
- doctr=1.9.0
- docutils=0.16
- dpkt=1.9.5
- editdistance-s=1.0.0
- elog=1.0.2
- elog=1.1.0
- entrypoints=0.3
- epics-base=7.0.5.0
- epics-pypdb=0.1.5
Expand All @@ -105,7 +105,7 @@ dependencies:
- fasteners=0.14.1
- ffmpeg=4.3.1
- filelock=3.0.12
- flake8=3.9.0
- flake8=3.9.1
- font-ttf-dejavu-sans-mono=2.37
- font-ttf-inconsolata=2.001
- font-ttf-source-code-pro=2.030
Expand All @@ -115,7 +115,7 @@ dependencies:
- fonts-conda-forge=1
- freetype=2.10.4
- fribidi=1.0.10
- fsspec=0.9.0
- fsspec=2021.4.0
- future=0.18.2
- fuzzywuzzy=0.18.0
- fzf=0.27.0
Expand All @@ -125,22 +125,22 @@ dependencies:
- giflib=5.2.1
- git=2.30.2
- gitdb=4.0.7
- gitpython=3.1.14
- gitpython=3.1.15
- glib=2.68.1
- glib-tools=2.68.1
- glob2=0.7
- gmp=6.2.1
- gnutls=3.6.13
- graphite2=1.3.13
- graphviz=2.47.0
- graphviz=2.47.1
- greenlet=1.0.0
- grpcio=1.33.2
- grpcio-tools=1.33.2
- gst-plugins-base=1.14.5
- gstreamer=1.18.4
- gtk2=2.24.33
- gts=0.7.6
- h5py=3.1.0
- h5py=3.2.1
- happi=1.9.0
- harfbuzz=2.8.0
- hdf5=1.10.6
Expand All @@ -152,13 +152,13 @@ dependencies:
- hutch-python=1.10.0
- hxrsnd=0.2.4
- icu=68.1
- identify=2.2.3
- identify=2.2.4
- idna=2.10
- imagecodecs=2021.3.31
- imageio=2.9.0
- imagesize=1.2.0
- importlib-metadata=3.10.1
- importlib_metadata=3.10.1
- importlib-metadata=4.0.1
- importlib_metadata=4.0.1
- importlib_resources=5.1.2
- iniconfig=1.1.1
- intake=0.6.2
Expand All @@ -168,7 +168,7 @@ dependencies:
- ipywidgets=7.6.3
- isodate=0.6.0
- isort=5.8.0
- jack=0.125.0
- jack=1.9.18
- jasper=1.900.1
- jdcal=1.4.1
- jedi=0.18.0
Expand Down Expand Up @@ -203,6 +203,7 @@ dependencies:
- libev=4.33
- libevent=2.1.10
- libffi=3.3
- libflac=1.3.3
- libgcc-ng=9.3.0
- libgd=2.3.2
- libgfortran-ng=9.3.0
Expand All @@ -217,19 +218,23 @@ dependencies:
- libllvm11=11.1.0
- libnghttp2=1.43.0
- libntlm=1.4
- libogg=1.3.4
- libopenblas=0.3.12
- libopencv=4.5.1
- libopus=1.3.1
- libpng=1.6.37
- libpq=12.3
- libprotobuf=3.15.8
- librsvg=2.50.3
- libsndfile=1.0.31
- libsodium=1.0.18
- libssh2=1.9.0
- libstdcxx-ng=9.3.0
- libtiff=4.2.0
- libtool=2.4.6
- libunwind=1.4.0
- libuuid=2.32.1
- libvorbis=1.3.7
- libwebp=1.2.0
- libwebp-base=1.2.0
- libxcb=1.13
Expand Down Expand Up @@ -269,7 +274,7 @@ dependencies:
- mysql-common=8.0.22
- mysql-libs=8.0.22
- mysqlclient=2.0.3
- nabs=1.1.1
- nabs=1.1.2
- nbclient=0.5.3
- nbconvert=6.0.7
- nbformat=5.1.3
Expand All @@ -282,7 +287,7 @@ dependencies:
- nose=1.3.7
- notebook=6.3.0
- nspr=4.30
- nss=3.63
- nss=3.64
- numba=0.53.1
- numcodecs=0.7.3
- numexpr=2.7.3
Expand Down Expand Up @@ -313,7 +318,7 @@ dependencies:
- pathspec=0.8.1
- patsy=0.5.1
- pcaspy=0.7.3
- pcdscalc=0.2.0
- pcdscalc=0.3.0
- pcdsdaq=2.3.4
- pcdsdevices=4.4.0
- pcdsutils=0.4.2
Expand All @@ -326,7 +331,7 @@ dependencies:
- pillow=8.1.2
- pims=0.5
- pint=0.17
- pip=21.0.1
- pip=21.1
- pixman=0.40.0
- pkginfo=1.7.0
- pluggy=0.13.1
Expand All @@ -335,7 +340,7 @@ dependencies:
- pooch=1.3.0
- portaudio=19.6.0
- poyo=0.5.0
- pre-commit=2.12.0
- pre-commit=2.12.1
- prettytable=2.1.0
- prometheus_client=0.10.1
- prompt-toolkit=3.0.18
Expand All @@ -351,7 +356,7 @@ dependencies:
- pthread-stubs=0.4
- ptyprocess=0.7.0
- py=1.10.0
- py-cpuinfo=7.0.0
- py-cpuinfo=8.0.0
- py-lief=0.10.1
- py-opencv=4.5.1
- py-spy=0.3.5
Expand All @@ -372,7 +377,7 @@ dependencies:
- pyflakes=2.3.1
- pygithub=1.53
- pygments=2.8.1
- pyjwt=2.0.1
- pyjwt=2.1.0
- pykerberos=1.2.1
- pymongo=3.11.0
- pyopenssl=20.0.1
Expand All @@ -389,7 +394,7 @@ dependencies:
- pysocks=1.7.1
- pytables=3.6.1
- pytest=6.2.3
- pytest-benchmark=3.2.3
- pytest-benchmark=3.4.1
- pytest-qt=3.3.0
- pytest-timeout=1.4.2
- python=3.8.8
Expand All @@ -400,7 +405,7 @@ dependencies:
- python-libarchive-c=2.9
- python-slugify=4.0.1
- python_abi=3.8
- pytmc=2.9.0
- pytmc=2.9.1
- pytz=2021.1
- pyviz_comms=2.0.1
- pywavelets=1.1.1
Expand All @@ -412,7 +417,7 @@ dependencies:
- qtconsole=5.0.3
- qtpy=1.9.0
- qtpyinheritance=0.0.1
- readline=8.0
- readline=8.1
- regex=2021.4.4
- reportlab=3.5.67
- requests=2.25.1
Expand All @@ -425,13 +430,13 @@ dependencies:
- schema=0.7.4
- scikit-image=0.18.1
- scikit-learn=0.24.1
- scipy=1.6.2
- scrypt=0.8.17
- scipy=1.6.3
- scrypt=0.8.18
- seaborn=0.11.1
- seaborn-base=0.11.1
- send2trash=1.5.0
- setuptools=49.6.0
- shellcheck=0.7.1
- shellcheck=0.7.2
- simplejson=3.17.2
- six=1.15.0
- slicerator=1.0.0
Expand All @@ -449,8 +454,8 @@ dependencies:
- sphinxcontrib-jsmath=1.0.1
- sphinxcontrib-qthelp=1.0.3
- sphinxcontrib-serializinghtml=1.1.4
- sqlalchemy=1.4.8
- sqlite=3.35.4
- sqlalchemy=1.4.11
- sqlite=3.35.5
- statsmodels=0.12.2
- suitcase-mongo=0.2.0
- suitcase-msgpack=0.2.4
Expand Down Expand Up @@ -483,7 +488,7 @@ dependencies:
- unidecode=1.2.0
- urllib3=1.26.4
- versioneer=0.19
- virtualenv=20.4.3
- virtualenv=20.4.4
- vsts-python-api=0.1.22
- wcwidth=0.2.5
- webencodings=0.5.1
Expand All @@ -510,11 +515,11 @@ dependencies:
- xz=5.2.5
- yaml=0.2.5
- yaml-cpp=0.6.3
- zarr=2.7.0
- zarr=2.8.1
- zeromq=4.3.4
- zfp=0.5.5
- zict=2.0.0
- zipp=3.4.1
- zlib=1.2.11
- zstd=1.4.9
prefix: /cds/home/z/zlentz/miniconda3/envs/pcds-4.1.2
prefix: /cds/home/z/zlentz/miniconda3/envs/pcds-4.1.3
1 change: 0 additions & 1 deletion envs/pcds/keep-updated.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ pyepics
pytmc
tc_release
timechart
transfocate
typhos

0 comments on commit adcebd2

Please sign in to comment.