Skip to content

Commit

Permalink
BLD: add pcdsdevices to conda test reqs, move it out of workflow cond…
Browse files Browse the repository at this point in the history
…a extras, add to dev-requirements (pip)
  • Loading branch information
tangkong committed Sep 29, 2023
1 parent a6a8cff commit 5162d4a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# Extras that will be installed for both conda/pip:
testing-extras: "happi"
# Extras to be installed only for conda-based testing:
conda-testing-extras: "pcdsdevices pyqt=5"
conda-testing-extras: "pyqt=5"
# Extras to be installed only for pip-based testing:
pip-testing-extras: "PyQt5<5.15"
# Set if using setuptools-scm for the conda-build workflow
Expand Down
1 change: 1 addition & 0 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ test:
- ipython>=7.16
- jinja2<3.1
- line_profiler
- pcdsdevices
- pytest
- pytest-benchmark
- pytest-qt
Expand Down
1 change: 1 addition & 0 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ flake8
ipython>=7.16
jinja2<3.1
line_profiler
pcdsdevices
pytest
pytest-benchmark
pytest-cov
Expand Down

0 comments on commit 5162d4a

Please sign in to comment.