Merge branch 'v0.6' into qt5-wip #2237

Open
kashikoibumi wants to merge 38 commits from kashikoibumi/qt5-wip into v0.6
Showing only changes of commit 4480d5d1dd - Show all commits

View File

@ -72,6 +72,8 @@ function install_python(){
wine python -m pip install pytools==2020.2 wine python -m pip install pytools==2020.2
echo "Upgrading pip" echo "Upgrading pip"
wine python -m pip install --upgrade pip wine python -m pip install --upgrade pip
# install pypiwin32 for win32com
wine python -m pip install pypiwin32
} }
function install_pyqt(){ function install_pyqt(){
@ -82,6 +84,8 @@ function install_pyqt(){
echo "Installing PyQt-${PYQT_VERSION} 32b" echo "Installing PyQt-${PYQT_VERSION} 32b"
wine PyQt${PYQT_VERSION}-x32.exe /S /WX wine PyQt${PYQT_VERSION}-x32.exe /S /WX
fi fi
# and qtpy
wine python -m pip install qtpy
} }
function install_openssl(){ function install_openssl(){