8000 remove PyQt4 support · enformatik/winpython@5d0c53b · GitHub
[go: up one dir, main page]
Skip to content

Commit 5d0c53b

Browse files
stonebigstonebig
committed
remove PyQt4 support
1 parent a9fc9da commit 5d0c53b

File tree

1 file changed

+4
-34
lines changed

1 file changed

+4
-34
lines changed

‎make.py

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ def py_arch(self):
342342
@property
343343
def prepath(self):
344344
"""Return PATH contents to be prepend to the environment variable"""
345-
path = [r"Lib\site-packages\PyQt5", r"Lib\site-packages\PyQt4",
345+
path = [r"Lib\site-packages\PyQt5",
346346
r"Lib\site-packages\PySide2", "", # Python root directory
347347
"DLLs", "Scripts", r"..\t", r"..\t\mingw32\bin"
348348
]
@@ -793,17 +793,6 @@ def _create_batch_scripts_initial(self):
793793
echo Binaries = .>>"%tmp_pyz%"
794794
:pyqt5_conf_exist
795795
796-
rem ******************
797-
rem handle PyQt4 if included
798-
rem ******************
799-
set tmp_pyz=%WINPYDIR%\Lib\site-packages\PyQt4
800-
if not exist "%tmp_pyz%" goto pyqt4_conf_exist
801-
set tmp_pyz=%tmp_pyz%\qt.conf
802-
if exist "%tmp_pyz%" goto pyqt4_conf_exist
803-
echo [Paths]>>"%tmp_pyz%"
804-
echo Prefix = .>>"%tmp_pyz%"
805-
echo Binaries = .>>"%tmp_pyz%"
806-
:pyqt4_conf_exist
807796
808797
rem ******************
809798
rem handle Pyzo configuration part
@@ -929,18 +918,6 @@ def _create_batch_scripts_initial(self):
929918
}
930919
}
931920
932-
#####################
933-
### handle PyQt4 if included
934-
#####################
935-
$env:tmp_pyz = "$env:WINPYDIR\Lib\site-packages\PyQt4"
936-
if (Test-Path "$env:tmp_pyz") {
937-
$env:tmp_pyz = "$env:tmp_pyz\qt.conf"
938-
if (-not (Test-Path "$env:tmp_pyz")) {
939-
"[Paths]"| Add-Content -Path $env:tmp_pyz
940-
"Prefix = ."| Add-Content -Path $env:tmp_pyz
941-
"Binaries = ."| Add-Content -Path $env:tmp_pyz
942-
}
943-
}
944921
945922
#####################
946923
### handle Pyzo configuration part
@@ -1294,8 +1271,8 @@ def _create_batch_scripts(self):
12941271
if exist "%WINPYDIR%\Lib\site-packages\PyQt5\examples\qtdemo\qtdemo.py" (
12951272
"%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\site-packages\PyQt5\examples\qtdemo\qtdemo.py"
12961273
)
1297-
if exist "%WINPYDIR%\Lib\site-packages\PyQt4\examples\demos\qtdemo\qtdemo.pyw" (
1298-
"%WINPYDIR%\pythonw.exe" "%WINPYDIR%\Lib\site-packages\PyQt4\examples\demos\qtdemo\qtdemo.pyw"
1274+
if exist "%WINPYDIR%\Lib\site-packages\PySide2\examples\datavisualization\bars3d.py" (
1275+
"%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\site-packages\PySide2\examples\datavisualization\bars3d.py"
12991276
)
13001277
""")
13011278

@@ -1310,8 +1287,6 @@ def _create_batch_scripts(self):
13101287
) else (
13111288
"%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" %*
13121289
)
1313-
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt4\designer.exe" (
1314-
"%WINPYDIR%\Lib\site-packages\PyQt4\designer.exe" %*
13151290
) else (
13161291
"%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
13171292
)
@@ -1325,11 +1300,9 @@ def _create_batch_scripts(self):
13251300
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" %*
13261301
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\assistant.exe" (
13271302
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\assistant.exe" %*
1328-
) else (
1329-
"%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
13301303
)
13311304
) else (
1332-
"%WINPYDIR%\Lib\site-packages\PyQt4\assistant.exe" %*
1305+
"%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
13331306
)
13341307
""")
13351308

@@ -1345,9 +1318,6 @@ def _create_batch_scripts(self):
13451318
cd/D "%WINPYDIR%\Lib\site-packages\PyQt5"
13461319
"%WINPYDIR%\Lib\site-packages\PyQt5\linguist.exe" %*
13471320
)
1348-
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt4\linguist.exe" (
1349-
cd/D "%WINPYDIR%\Lib\site-packages\PyQt4"
1350-
"%WINPYDIR%\Lib\site-packages\PyQt4\linguist.exe" %*
13511321
) else (
13521322
"%WINPYDIR%\Lib\site-packages\PySide2\linguist.exe" %*
13531323
)

0 commit comments

Comments
 (0)
0