Skip to content

Commit

Permalink
Merge pull request #200 from ZLLentz/rel-5.0.0
Browse files Browse the repository at this point in the history
ENH: update to pcds-5.0.0
  • Loading branch information
ZLLentz authored Oct 4, 2021
2 parents 9b2d24c + 4a85c38 commit fbe4fca
Show file tree
Hide file tree
Showing 9 changed files with 454 additions and 142 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
fast_finish: true

allow_failures:
- name: "Python 3.9 Next Env Unit Tests"
- name: "Python 3.9 Master Branch Unit Tests"
- name: "Python 3.10 Next Env Unit Tests"

Expand All @@ -38,6 +37,7 @@ jobs:
- which python
# Always create the environment from yaml
- mamba env create -q -n pcds-test -f envs/pcds/env.yaml
- conda activate pcds-test
# Set up the tests
- cd scripts
- python test_setup.py pcds --tag
Expand Down
21 changes: 12 additions & 9 deletions envs/pcds/conda-packages.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ads-async>=0.1.2
anaconda-client
blark>=0.1.6
bluesky>=1.7.0
blark>=0.1.7
bluesky>=1.8.0
bluesky-live
bokeh>=1.0.1
botorch
Expand All @@ -23,10 +23,10 @@ gh
gpytorch<1.5.0
grpcio-tools
h5py
happi>=1.9.0
happi>=1.10.0
holoviews>=1.10.9
hutch-python>=1.11.2
hxrsnd>=0.2.4
hutch-python>=1.12.0
hxrsnd>=0.2.6
ipython>=7.1
isort
jupyter
Expand All @@ -35,17 +35,17 @@ line_profiler
lucid>=0.9.0
lxml
mysqlclient
nabs>=1.1.2
nabs>=1.1.3
numpy>=1.14
opencv
ophyd>=1.6.1
ophyd>=1.6.2
pandas
panel
papermill
pcaspy
pcdscalc>=0.3.2
pcdsdaq>=2.3.4
pcdsdevices>=4.7.1
pcdsdevices>=4.8.0
pcdsutils>=0.5.0
pcdswidgets>=0.5.1
periodictable
Expand All @@ -64,9 +64,12 @@ pyqtgraph=0.11.1
py-spy
pytables
pytest
pytest-aiohttp
pytest-benchmark
pytest-qt=3.3.0
pytest-repeat
pytest-timeout
pytest-xdist
python-graphviz
python-ldap
pytmc>=2.10.0
Expand All @@ -82,7 +85,7 @@ sphinx
sphinx_rtd_theme
tc_release>=0.2.1
timechart>=1.2.4
transfocate=0.5.0
transfocate>=0.5.2
typhos>=2.0.0
versioneer
xarray
Expand Down
Loading

0 comments on commit fbe4fca

Please sign in to comment.