E578 Merge pull request #123 from stonebig/master · winpython/winpython@f26c6f0 · GitHub
[go: up one dir, main page]

Skip to content

Commit f26c6f0

Browse files
committed
Merge pull request #123 from stonebig/master
qt5 fix
2 parents 1a2a22a + df37c2e commit f26c6f0

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

winpython/data/packages.ini

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,12 @@ description=Python bindings for LLVM
200200
[lmfit]
201201
description=Least-Squares Minimization with Bounds and Constraints
202202

203+
[locket]
204+
description=File-based locks for Python for Linux and Windows
205+
206+
[locket.py]
207+
description=File-based locks for Python for Linux and Windows
208+
203209
[logilab-astng]
204210
description=Rebuild a new abstract syntax tree from Python's ast (required for pylint)
205211
@@ -248,7 +254,7 @@ category=util
248254
[mysql-connector-python]
249255
description=MySQL driver written in Python
250256
251-
[netCDF4]
257+
[netcdf4]
252258
description=python/numpy interface to netCDF library (versions 3 and 4)
253259
254260
[networkx]
@@ -298,6 +304,9 @@ description=functional data manipulation for pandas
298304
[param]
299305
description=Declarative Python programming using Parameters.
300306
307+
[partd]
308+
description=Appendable key-value storage
309+
301310
[patsy]
302311
description=Describing statistical models using symbolic formulas
303312
category=dataoric

winpython/wppm.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -449,22 +449,24 @@ def install(self, package, install_options=None):
449449

450450
def handle_specific_packages(self, package):
451451
"""Packages requiring additional configuration"""
452-
if package.name in ('PyQt', 'PyQt4'):
452+
if package.name.lower() in ('pyqt4', 'pyqt5'):
453453
# Qt configuration file (where to find Qt)
454454
name = 'qt.conf'
455455
contents = """[Paths]
456456
Prefix = .
457457
Binaries = ."""
458458
self.create_file(package, name,
459-
osp.join('Lib', 'site-packages', 'PyQt4'),
459+
osp.join('Lib', 'site-packages', package.name),
460460
contents)
461461
self.create_file(package, name, '.',
462-
contents.replace('.', './Lib/site-packages/PyQt4'))
462+
contents.replace('.', './Lib/site-packages/%s' % package.name))
463463
# pyuic script
464-
self.create_file(package, 'pyuic4.bat', 'Scripts', r'''@echo off
465-
python "%WINPYDIR%\Lib\site-packages\PyQt4\uic\pyuic.py" %1 %2 %3 %4 %5 %6 %7 %8 %9''')
464+
self.create_file(package, 'pyuic%s.bat' % package.name[-1],
465+
'Scripts', r'''@echo off
466+
python "%WINPYDIR%\Lib\site-packages\%s\uic\pyuic.py" %1 %2 %3 %4 %5 %6 %7 %8 %9'''
467+
% package.name)
466468
# Adding missing __init__.py files (fixes Issue 8)
467-
uic_path = osp.join('Lib', 'site-packages', 'PyQt4', 'uic')
469+
uic_path = osp.join('Lib', 'site-packages', package.name, 'uic')
468470
for dirname in ('Loader', 'port_v2', 'port_v3'):
469471
self.create_file(package, '__init__.py',
470472
osp.join(uic_path, dirname), '')

0 commit comments

Comments
 (0)
0