Skip to content

Commit

Permalink
Merge pull request #594 from tangkong/bld_recipe
Browse files Browse the repository at this point in the history
BLD: update conda recipe
  • Loading branch information
tangkong committed Oct 2, 2023
2 parents 6d193ea + 5f39433 commit 4ad54e7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ 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: ""
# Extras to be installed only for pip-based testing:
pip-testing-extras: "PyQt5<5.15"
pip-testing-extras: ""
# Set if using setuptools-scm for the conda-build workflow
use-setuptools-scm: true
5 changes: 2 additions & 3 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@ requirements:
- numpy
- numpydoc
- ophyd >=1.5.0
- pcdsdevices
- pcdsutils
- platformdirs
- pydm >=1.19.1
- pyqt
- pyqt =5
- pyqtgraph
- pyyaml
- qdarkstyle
Expand All @@ -44,7 +43,6 @@ requirements:
- timechart >=1.2.4
run_constrained:
- happi >=1.14.0
- jupyter_client <7.3.2



Expand All @@ -62,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 4ad54e7

Please sign in to comment.