Skip to content

PyQt5 build fix #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2015
Merged

PyQt5 build fix #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,17 @@ def _install_required_packages(self):
"""Installing required packages"""
print("Installing required packages")

# Specific check for PyQt5 non-wheel:
import glob
if len(glob.glob(osp.join(self.wheeldir, 'PyQt5*.exe'))) > 0:
self.install_package(
'PyQt5-([0-9\.\-]*)-gpl-Py%s-Qt([0-9\.\-]*)%s.exe'
% (self.python_version, self.pyqt_arch))
# Install 'critical' packages first
for happy_few in['setuptools', 'pip', 'pywin32']:
self.install_package(
'%s-([0-9\.]*[a-z\+]*[0-9]?)(.*)(\.exe|\.whl)' % happy_few,
install_options = self.install_options+['--upgrade'])
install_options=self.install_options+['--upgrade'])

def _install_all_other_packages(self):
"""Try to install all other packages in wheeldir"""
Expand Down Expand Up @@ -528,7 +534,7 @@ def _create_launchers(self):
QtDemo_path = 'demos\qtdemo' if QtV == 4 else 'qtdemo'
if osp.isdir(osp.join(python_lib_dir, PyQt)):
self.create_launcher('Qt%s Demo.exe' % QtV, 'qt.ico',
args='qtdemo.pyw', workdir=
args='qtdemo.pyw' if QtV == 4 else 'qtdemo.py', workdir=
r'${WINPYDIR}\Lib\site-packages\%s\examples\%s' %
(PyQt, QtDemo_path) )
self.create_launcher('Qt%s Assistant.exe' % QtV,
Expand Down Expand Up @@ -1068,10 +1074,10 @@ def make_all(build_number, release_level, pyver,

#make_all(4, '', pyver='3.4', rootdir=r'D:\Winpython',
# verbose=False, archis=(32, ))
make_all(4, '', pyver='3.4', rootdir=r'D:\Winpython',
verbose=False, archis=(64, ), flavor='')
#make_all(4, '', pyver='3.4', rootdir=r'D:\Winpython\basedirQt5',
# verbose=False, archis=(64, ))
#make_all(4, '', pyver='3.4', rootdir=r'D:\Winpython',
# verbose=False, archis=(64, ), flavor='')
make_all(4, '', pyver='3.4', rootdir=r'D:\WinpythonQt5',
verbose=False, archis=(64, ))
#make_all(1, '', pyver='2.7', rootdir=r'D:\Winpython',
# verbose=False, archis=(64, ))
#make_all(4, '', pyver='3.4', rootdir=r'D:\Winpython',
Expand Down