diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index de45f8f8..783e5e27 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -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 diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index cb41c8de..3b9a9daa 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -31,11 +31,10 @@ requirements: - numpy - numpydoc - ophyd >=1.5.0 - - pcdsdevices - pcdsutils - platformdirs - pydm >=1.19.1 - - pyqt + - pyqt =5 - pyqtgraph - pyyaml - qdarkstyle @@ -44,7 +43,6 @@ requirements: - timechart >=1.2.4 run_constrained: - happi >=1.14.0 - - jupyter_client <7.3.2 @@ -62,6 +60,7 @@ test: - ipython>=7.16 - jinja2<3.1 - line_profiler + - pcdsdevices - pytest - pytest-benchmark - pytest-qt diff --git a/dev-requirements.txt b/dev-requirements.txt index 5de2f537..ad1c1cea 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -3,6 +3,7 @@ flake8 ipython>=7.16 jinja2<3.1 line_profiler +pcdsdevices pytest pytest-benchmark pytest-cov