Merge pull request #999 from klauer/bld_unpin_pyqt

BLD: pin pyqt to 5.x
slaclab · May 23, 2023 · 72bfc74 · 72bfc74
2 parents 504e084 + 13e5c1e
commit 72bfc74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -17,7 +17,7 @@ requirements:
     - python
     - pip
     - setuptools
-    - pyqt >=5,<5.15
+    - pyqt =5
     - qtpy
   run:
     - python
@@ -26,7 +26,7 @@ requirements:
     - scipy
     - pyepics
     - requests
-    - pyqt >=5,<5.15
+    - pyqt =5
     - pyqtgraph
     - qtpy
     - entrypoints

diff --git 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 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.