From 35337afd1892015d180e959c7644930002492108 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Thu, 10 Mar 2022 10:46:38 -0500 Subject: [PATCH 1/2] Increase minimal required qtpy version This is necessary to have the new PyQt6 support. --- requirements/environment.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/environment.yml b/requirements/environment.yml index 422caab8..17a3b8aa 100644 --- a/requirements/environment.yml +++ b/requirements/environment.yml @@ -3,7 +3,7 @@ channels: dependencies: # Main dependencies - pyqt -- qtpy +- qtpy >=2.0.1 - traitlets - ipython_genutils - jupyter_core diff --git a/setup.py b/setup.py index 64a576d8..f14b4910 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ 'jupyter_client>=4.1', 'pygments', 'ipykernel>=4.1', # not a real dependency, but require the reference kernel - 'qtpy', + 'qtpy>=2.0.1', 'pyzmq>=17.1' ], extras_require = { From b87193d7e76948454dfc955243b3432049aaabd6 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Thu, 10 Mar 2022 10:46:56 -0500 Subject: [PATCH 2/2] Update contributing instructions --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d1ac93a6..c96f33c8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ Use Conda to install dependencies and activate the development environment. ``` conda create -n qtdev python=3 conda activate qtdev -conda install qtpy pyqt +conda env update --file requirements/environment.yml ``` To run after the changes have been made to source (preferred):