Skip to content

Commit

Permalink
Merge pull request #208 from ZLLentz/rel-5.1.1
Browse files Browse the repository at this point in the history
pcds-5.1.1
  • Loading branch information
ZLLentz authored Dec 4, 2021
2 parents 1f745b2 + db09a59 commit 0ee206c
Show file tree
Hide file tree
Showing 7 changed files with 255 additions and 87 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
# Always create the environment from yaml
- mamba env create -q -n pcds-test -f envs/pcds/env.yaml
- conda activate pcds-test
- conda list
# Set up the tests
- cd scripts
- python test_setup.py pcds --tag
Expand Down Expand Up @@ -70,6 +71,7 @@ jobs:
- python update_tags.py pcds
- timeout 20m ./create_base_env.sh dev-3.9 pcds 3.9
- conda activate pcds-dev-3.9
- conda list
# Set up the tests
- python test_setup.py pcds
- |
Expand Down Expand Up @@ -105,6 +107,7 @@ jobs:
- python update_tags.py pcds
- timeout 20m ./create_base_env.sh next-3.9 pcds 3.9
- conda activate pcds-next-3.9
- conda list
# Set up the tests
- python test_setup.py pcds --tag
before_script:
Expand Down Expand Up @@ -135,6 +138,7 @@ jobs:
- python update_tags.py pcds
- timeout 20m ./create_base_env.sh next-3.10 pcds 3.10
- conda activate pcds-next-3.10
- conda list
# Set up the tests
- python test_setup.py pcds --tag
before_script:
Expand Down
17 changes: 12 additions & 5 deletions envs/pcds/conda-packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ conda-pack
conda-smithy
cookiecutter
coverage
databroker>=1.2.4
datashader
doctr
docutils=0.16
Expand All @@ -28,7 +27,7 @@ happi>=1.10.1
holoviews>=1.10.9
hutch-python>=1.13.0
hxrsnd>=0.2.6
ipython>=7.1
ipython>=7.30.1
isort
jupyter
lightpath>=0.6.9
Expand All @@ -46,10 +45,11 @@ papermill
pcaspy
pcdscalc>=0.3.2
pcdsdaq>=2.3.4
pcdsdevices>=5.0.0
pcdsdevices>=5.0.2
pcdsutils>=0.6.0
pcdswidgets>=0.6.0
periodictable
pipdeptree
pmgr>=2.0.2
pre-commit
psdaq-control-minimal>=3.3.19
Expand Down Expand Up @@ -85,10 +85,17 @@ shellcheck
simplejson
sphinx
sphinx_rtd_theme
tc_release>=0.2.1
suitcase-csv
suitcase-json-metadata
suitcase-jsonl
suitcase-mongo
suitcase-msgpack
suitcase-specfile
suitcase-tiff
tc_release>=0.2.2
timechart>=1.2.4
transfocate>=0.5.2
typhos>=2.1.0
typhos>=2.2.0
versioneer
xarray
xraylib
Loading

0 comments on commit 0ee206c

Please sign in to comment.