X Tutup
Skip to content

Commit 3b9eb90

Browse files
stonebigstonebig
committed
remove dead code relative to Qt , wpcp, mingw
1 parent af91550 commit 3b9eb90

File tree

2 files changed

+2
-184
lines changed

2 files changed

+2
-184
lines changed

‎make.py‎

Lines changed: 0 additions & 181 deletions
Original file line numberDiff line numberDiff line change
@@ -775,28 +775,6 @@ def _create_launchers(self):
775775
args=r"/k wpcp.bat",
776776
)
777777

778-
# Multi-Qt launchers
779-
#self.create_launcher(
780-
# "Qt Designer.exe",
781-
# "qtdesigner.ico",
782-
# command="wscript.exe",
783-
# args=r"Noshell.vbs qtdesigner.bat",
784-
#)
785-
786-
#self.create_launcher(
787-
# "Qt Linguist.exe",
788-
# "qtlinguist.ico",
789-
# command="wscript.exe",
790-
# args=r"Noshell.vbs qtlinguist.bat",
791-
#)
792-
793-
#self.create_launcher(
794-
# "Qt Assistant.exe",
795-
# "qtassistant.ico",
796-
# command="wscript.exe",
797-
# args=r"Noshell.vbs qtassistant.bat",
798-
#)
799-
800778
# Jupyter launchers
801779

802780
# removing another Qt string
@@ -1340,37 +1318,6 @@ def _create_batch_scripts(self):
13401318
The environment variables are set-up in 'env_.bat' and 'env_for_icons.bat'.""",
13411319
)
13421320

1343-
self.create_batch_script(
1344-
"make_cython_use_mingw.bat",
1345-
r"""@echo off
1346-
call "%~dp0env.bat"
1347-
1348-
rem ******************
1349-
rem mingw part
1350-
rem ******************
1351-
1352-
set pydistutils_cfg=%WINPYDIRBASE%\settings\pydistutils.cfg
1353-
1354-
set tmp_blank=
1355-
(
1356-
echo [config]
1357-
echo compiler=mingw32
1358-
echo.
1359-
echo [build]
1360-
echo compiler=mingw32
1361-
echo.
1362-
echo [build_ext]
1363-
echo compiler=mingw32
1364-
) > "%pydistutils_cfg%"
1365-
1366-
echo cython has been set to use mingw32
1367-
echo to remove this, remove file "%pydistutils_cfg%"
1368-
1369-
rem pause
1370-
1371-
""",
1372-
)
1373-
13741321
self.create_batch_script(
13751322
"make_cython_use_vc.bat",
13761323
r"""@echo off
@@ -1555,15 +1502,6 @@ def _create_batch_scripts(self):
15551502
""",
15561503
)
15571504

1558-
self.create_batch_script(
1559-
"winjupyter_nbclassic.bat",
1560-
r"""@echo off
1561-
call "%~dp0env_for_icons.bat" %*
1562-
cd/D "%WINPYWORKDIR1%"
1563-
"%WINPYDIR%\scripts\jupyter-nbclassic.exe" %*
1564-
""",
1565-
)
1566-
15671505
self.create_batch_script(
15681506
"winjupyter_lab.bat",
15691507
r"""@echo off
@@ -1579,110 +1517,6 @@ def _create_batch_scripts(self):
15791517
call "%~dp0env_for_icons.bat" %*
15801518
cd/D "%WINPYWORKDIR1%"
15811519
"%WINPYDIR%\scripts\jupyter-qtconsole.exe" %*
1582-
""",
1583-
)
1584-
1585-
self.create_batch_script(
1586-
"qtdemo.bat",
1587-
r"""@echo off
1588-
call "%~dp0env_for_icons.bat" %*
1589-
cd/D "%WINPYWORKDIR1%"
1590-
if exist "%WINPYDIR%\Lib\site-packages\PyQt5\examples\qtdemo\qtdemo.py" (
1591-
"%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\site-packages\PyQt5\examples\qtdemo\qtdemo.py"
1592-
)
1593-
if exist "%WINPYDIR%\Lib\site-packages\PySide2\examples\datavisualization\bars3d.py" (
1594-
"%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\site-packages\PySide2\examples\datavisualization\bars3d.py"
1595-
)
1596-
""",
1597-
do_changes=changes,
1598-
)
1599-
1600-
self.create_batch_script(
1601-
"qtdesigner.bat",
1602-
r"""@echo off
1603-
call "%~dp0env_for_icons.bat" %*
1604-
cd/D "%WINPYWORKDIR1%"
1605-
if "%QT_API%"=="" ( set QT_API=pyqt5 )
1606-
if "%QT_API%"=="pyqt5" (
1607-
if exist "%WINPYDIR%\Scripts\designer.exe" (
1608-
"%WINPYDIR%\Scripts\designer.exe" %*
1609-
) else if exist "%WINPYDIR%\Lib\site-packages\qt5_applications\Qt\bin\designer.exe" (
1610-
"%WINPYDIR%\Lib\site-packages\qt5_applications\Qt\bin\designer.exe" %*
1611-
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\designer.exe" (
1612-
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\designer.exe" %*
1613-
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" (
1614-
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" %*
1615-
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" (
1616-
"%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" %*
1617-
) else if exist "%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" (
1618-
"%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
1619-
) else (
1620-
"%WINPYDIR%\Lib\site-packages\PySide6\designer.exe" %*
1621-
)
1622-
) else (
1623-
"%WINPYDIR%\Lib\site-packages\PySide6\designer.exe" %*
1624-
)
1625-
""",
1626-
)
1627-
1628-
self.create_batch_script(
1629-
"qtassistant.bat",
1630-
r"""@echo off
1631-
call "%~dp0env_for_icons.bat" %*
1632-
cd/D "%WINPYWORKDIR1%"
1633-
if "%QT_API%"=="" ( set QT_API=pyqt5 )
1634-
if "%QT_API%"=="pyqt5" (
1635-
if exist "%WINPYDIR%\Scripts\assistant.exe" (
1636-
"%WINPYDIR%\Scripts\assistant.exe" %*
1637-
) else if exist "%WINPYDIR%\Lib\site-packages\qt5_applications\Qt\bin\assistant.exe" (
1638-
"%WINPYDIR%\Lib\site-packages\qt5_applications\Qt\bin\assistant.exe" %*
1639-
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\assistant.exe" (
1640-
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\assistant.exe" %*
1641-
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" (
1642-
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" %*
1643-
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" (
1644-
"%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
1645-
) else if exist "%WINPYDIR%\Lib\site-packages\PySide2\assistant.exe" (
1646-
"%WINPYDIR%\Lib\site-packages\PySide2\assistant.exe" %*
1647-
) else (
1648-
"%WINPYDIR%\Lib\site-packages\PySide6\assistant.exe" %*
1649-
)
1650-
) else (
1651-
"%WINPYDIR%\Lib\site-packages\PySide6\assistant.exe" %*
1652-
)
1653-
""",
1654-
)
1655-
1656-
self.create_batch_script(
1657-
"qtlinguist.bat",
1658-
r"""@echo off
1659-
call "%~dp0env_for_icons.bat" %*
1660-
cd/D "%WINPYWORKDIR1%"
1661-
if "%QT_API%"=="" ( set QT_API=pyqt5 )
1662-
if "%QT_API%"=="pyqt5" (
1663-
if exist "%WINPYDIR%\Scripts\linguist.exe" (
1664-
"%WINPYDIR%\Scripts\linguist.exe" %*
1665-
) else if exist "%WINPYDIR%\Lib\site-packages\qt5_applications\Qt\bin\linguist.exe" (
1666-
"%WINPYDIR%\Lib\site-packages\qt5_applications\Qt\bin\linguist.exe" %*
1667-
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\linguist.exe" (
1668-
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\linguist.exe" %*
1669-
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" (
1670-
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" %*
1671-
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" (
1672-
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" %*
1673-
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\linguist.exe" (
1674-
cd/D "%WINPYDIR%\Lib\site-packages\PyQt5"
1675-
"%WINPYDIR%\Lib\site-packages\PyQt5\linguist.exe" %*
1676-
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" %*
1677-
) else if exist "%WINPYDIR%\Lib\site-packages\PySide2\linguist.exe" (
1678-
"%%WINPYDIR%\Lib\site-packages\PySide2\linguist.exe" %*
1679-
) else (
1680-
"%WINPYDIR%\Lib\site-packages\PySide6\linguist.exe" %*
1681-
)
1682-
) else (
1683-
"%WINPYDIR%\Lib\site-packages\PySide6\linguist.exe" %*
1684-
)
1685-
16861520
""",
16871521
)
16881522

@@ -1737,28 +1571,13 @@ def _create_batch_scripts(self):
17371571
do_changes=changes,
17381572
)
17391573

1740-
self.create_batch_script(
1741-
"winpyzo.bat",
1742-
r"""@echo off
1743-
call "%~dp0env_for_icons.bat" %*
1744-
cd/D "%WINPYDIR%"
1745-
"%WINPYDIR%\scripts\pyzo.exe" %*
1746-
""",
1747-
)
17481574

17491575
self.create_batch_script( # virtual environment mimicking
17501576
"activate.bat",
17511577
r"""@echo off
17521578
call "%~dp0env.bat" %*
17531579
""",
17541580
)
1755-
# pre-run mingw batch
1756-
print("now pre-running extra mingw")
1757-
filepath = str(Path(self.winpydir) / "scripts" / "make_cython_use_mingw.bat")
1758-
p = subprocess.Popen(filepath, shell=True, stdout=subprocess.PIPE)
1759-
stdout, stderr = p.communicate()
1760-
1761-
self._print_done()
17621581

17631582
self.create_batch_script(
17641583
"winvscode.bat",

‎pyproject.toml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ authors = [
99
{name = "stonebig"},
1010
]
1111
dependencies = []
12-
requires-python = ">=3.6"
12+
requires-python = ">=3.8"
1313
readme = "README.rst"
1414
license = {file = "LICENSE"}
1515
classifiers=[
@@ -26,12 +26,11 @@ classifiers=[
2626
]
2727
dynamic = ["version",]
2828
description="WinPython distribution tools, including WPPM"
29-
keywords = ["PySide6", "PyQt6", "PyQt5", "PySide2"]
29+
keywords = ["Portable","Windows"]
3030

3131
[project.urls]
3232
Documentation = "https://winpython.github.io/"
3333
Source = "https://github.com/winpython/winpython"
3434

3535
[project.scripts]
36-
wpcp = "winpython.controlpanel:main"
3736
wppm = "winpython.wppm:main"

0 commit comments

Comments
 (0)
X Tutup