From 0765023c96370d0d10aeec8934a739cfd4557745 Mon Sep 17 00:00:00 2001
From: Ken Lauer <klauer@slac.stanford.edu>
Date: Thu, 18 May 2023 14:44:22 -0700
Subject: [PATCH 1/3] BLD: pin pyqt to 5.x

---
 conda-recipe/meta.yaml       | 2 +-
 docs/source/installation.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 11ba051fa..54fded836 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -26,7 +26,7 @@ requirements:
     - scipy
     - pyepics
     - requests
-    - pyqt >=5,<5.15
+    - pyqt >=5,<6
     - pyqtgraph
     - qtpy
     - entrypoints
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
index f1baee00c..bd7d71158 100644
--- a/docs/source/installation.rst
+++ b/docs/source/installation.rst
@@ -15,7 +15,7 @@ Installing PyDM and Prerequisites with Anaconda
 After installing Anaconda (see https://www.anaconda.com/download/), create a new
 environment for PyDM::
   
-  $ conda create -n pydm-environment python=3.8 "pyqt >=5,<5.15" pip numpy scipy six psutil pyqtgraph pydm -c conda-forge
+  $ conda create -n pydm-environment python=3.8 "pyqt >=5,<6" pip numpy scipy six psutil pyqtgraph pydm -c conda-forge
   $ source activate pydm-environment
   
 Once you've installed and activated the environment, you should be able to run 'pydm' to launch PyDM, or run 'designer' to launch Qt Designer.  If you are on Windows, run these commands from the Anaconda Prompt.

From 51c4396dc816626e0192d25ea74eb7fdf54f7b24 Mon Sep 17 00:00:00 2001
From: Ken Lauer <klauer@slac.stanford.edu>
Date: Thu, 18 May 2023 14:59:00 -0700
Subject: [PATCH 2/3] BLD: try that again

---
 conda-recipe/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 54fded836..cbbb8a33e 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -17,7 +17,7 @@ requirements:
     - python
     - pip
     - setuptools
-    - pyqt >=5,<5.15
+    - pyqt >=5,<6
     - qtpy
   run:
     - python

From 13e5c1ef08f998635dcdbe6c0135e4502b38ce01 Mon Sep 17 00:00:00 2001
From: Ken Lauer <klauer@slac.stanford.edu>
Date: Thu, 18 May 2023 15:07:03 -0700
Subject: [PATCH 3/3] BLD: use more terse pyqt=5 syntax because we can

---
 conda-recipe/meta.yaml       | 4 ++--
 docs/source/installation.rst | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index cbbb8a33e..af7c129e3 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -17,7 +17,7 @@ requirements:
     - python
     - pip
     - setuptools
-    - pyqt >=5,<6
+    - pyqt =5
     - qtpy
   run:
     - python
@@ -26,7 +26,7 @@ requirements:
     - scipy
     - pyepics
     - requests
-    - pyqt >=5,<6
+    - pyqt =5
     - pyqtgraph
     - qtpy
     - entrypoints
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
index bd7d71158..9483086ee 100644
--- a/docs/source/installation.rst
+++ b/docs/source/installation.rst
@@ -15,7 +15,7 @@ Installing PyDM and Prerequisites with Anaconda
 After installing Anaconda (see https://www.anaconda.com/download/), create a new
 environment for PyDM::
   
-  $ conda create -n pydm-environment python=3.8 "pyqt >=5,<6" pip numpy scipy six psutil pyqtgraph pydm -c conda-forge
+  $ conda create -n pydm-environment python=3.8 pyqt=5 pip numpy scipy six psutil pyqtgraph pydm -c conda-forge
   $ source activate pydm-environment
   
 Once you've installed and activated the environment, you should be able to run 'pydm' to launch PyDM, or run 'designer' to launch Qt Designer.  If you are on Windows, run these commands from the Anaconda Prompt.