From a6a8cffa4ff3bb9a7c93dbb57681713dec6c27da Mon Sep 17 00:00:00 2001 From: tangkong Date: Thu, 28 Sep 2023 11:36:33 -0700 Subject: [PATCH 1/4] BLD: update conda recipe --- conda-recipe/meta.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index cb41c8de..db427ea6 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 From 5162d4a493a03409fd09ccd1e160fa4caa2f4d6c Mon Sep 17 00:00:00 2001 From: tangkong Date: Fri, 29 Sep 2023 11:05:00 -0700 Subject: [PATCH 2/4] BLD: add pcdsdevices to conda test reqs, move it out of workflow conda extras, add to dev-requirements (pip) --- .github/workflows/standard.yml | 2 +- conda-recipe/meta.yaml | 1 + dev-requirements.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index de45f8f8..9875c79e 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -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 diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index db427ea6..3b9a9daa 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -60,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 From 07f7ff8308aa0f8dd6be6360bf42ed972574649c Mon Sep 17 00:00:00 2001 From: tangkong Date: Fri, 29 Sep 2023 11:28:08 -0700 Subject: [PATCH 3/4] BLD: pyqt=5 is in conda recipe requirements already --- .github/workflows/standard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index 9875c79e..77a8f501 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -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: "pyqt=5" + conda-testing-extras: "" # 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 From 5f394335facd1ab35ff60ff34c50ff0cfb21c209 Mon Sep 17 00:00:00 2001 From: Robert Tang-Kong <35379409+tangkong@users.noreply.github.com> Date: Fri, 29 Sep 2023 11:39:02 -0700 Subject: [PATCH 4/4] Remove PyQt5<5.15 pin in pip-extras Co-authored-by: Ken Lauer --- .github/workflows/standard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index 77a8f501..783e5e27 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -20,6 +20,6 @@ jobs: # Extras to be installed only for conda-based testing: 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