From f8f2839b55ec01c8796727ec5b9773e49272e9e7 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 10 Nov 2020 16:29:11 +1000 Subject: [PATCH] add pyqtwebengine to wheel deps and bump minimum required pyqt --- docs/development.md | 2 +- qt/aqt/BUILD.bazel | 4 ++-- scripts/windows-ci.bat | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/development.md b/docs/development.md index 0c8e29233..b4c45fa07 100644 --- a/docs/development.md +++ b/docs/development.md @@ -31,7 +31,7 @@ From Anki 2.1.36 onwards: ``` $ python -m venv pyenv -$ pyenv/bin/pip install aqt anki pyqtwebengine +$ pyenv/bin/pip install aqt $ pyenv/bin/python -c 'import aqt; aqt.run()' ``` diff --git a/qt/aqt/BUILD.bazel b/qt/aqt/BUILD.bazel index 975cfd5cf..9341b557a 100644 --- a/qt/aqt/BUILD.bazel +++ b/qt/aqt/BUILD.bazel @@ -93,7 +93,6 @@ py_wheel( python_version = ">=3.8", requires = [ # "pyaudio", # currently off as a pain to install on Windows for code completion - # "pyqtwebengine", # depending on this limits installable qt5 versions "beautifulsoup4", "requests", "send2trash", @@ -102,7 +101,8 @@ py_wheel( "flask", "flask_cors", "waitress", - "pyqt5>=5.9", + "pyqt5>=5.12", + "pyqtwebengine", 'psutil; sys.platform == "win32"', 'pywin32; sys.platform == "win32"', "anki==" + anki_version, diff --git a/scripts/windows-ci.bat b/scripts/windows-ci.bat index e20b1d12a..fe95b7269 100755 --- a/scripts/windows-ci.bat +++ b/scripts/windows-ci.bat @@ -24,7 +24,7 @@ call venv\scripts\activate for %%i in (bazel-bin/pylib/anki/*.whl) do set "pylib=%%~i" for %%i in (bazel-bin/qt/aqt/*.whl) do set "qt=%%~i" echo Installing wheels... -venv\scripts\pip install bazel-bin/pylib/anki/%pylib% bazel-bin/qt/aqt/%qt% pyqtwebengine +venv\scripts\pip install bazel-bin/pylib/anki/%pylib% bazel-bin/qt/aqt/%qt% IF %ERRORLEVEL% NEQ 0 exit /B 1 echo Importing...