summaryrefslogtreecommitdiffstats
path: root/PC/layout
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2021-01-08 23:35:01 (GMT)
committerGitHub <noreply@github.com>2021-01-08 23:35:01 (GMT)
commit0e2a0f72cc9af0899eacb5604e44a563c0b06110 (patch)
tree73587df57200aa0b1c7d4c4ce476a07dbea8d6e6 /PC/layout
parent68e1f259bee7723d63488854b69a4bef2b7e5db2 (diff)
downloadcpython-0e2a0f72cc9af0899eacb5604e44a563c0b06110.zip
cpython-0e2a0f72cc9af0899eacb5604e44a563c0b06110.tar.gz
cpython-0e2a0f72cc9af0899eacb5604e44a563c0b06110.tar.bz2
bpo-42802: Remove distutils bdist_wininst command (GH-24043)
The distutils bdist_wininst command deprecated in Python 3.8 has been removed. The distutils bidst_wheel command is now recommended to distribute binary packages on Windows. * Remove Lib/distutils/command/bdist_wininst.py * Remove PC/bdist_wininst/ project * Remove Lib/distutils/command/wininst-*.exe programs * Remove all references to bdist_wininst
Diffstat (limited to 'PC/layout')
-rw-r--r--PC/layout/main.py9
-rw-r--r--PC/layout/support/distutils.command.bdist_wininst.py25
-rw-r--r--PC/layout/support/options.py2
3 files changed, 0 insertions, 36 deletions
diff --git a/PC/layout/main.py b/PC/layout/main.py
index 8c69c915..fb6f526 100644
--- a/PC/layout/main.py
+++ b/PC/layout/main.py
@@ -33,9 +33,6 @@ from .support.pip import *
from .support.props import *
from .support.nuspec import *
-BDIST_WININST_FILES_ONLY = FileNameSet("wininst-*", "bdist_wininst.py")
-BDIST_WININST_STUB = "PC/layout/support/distutils.command.bdist_wininst.py"
-
TEST_PYDS_ONLY = FileStemSet("xxlimited", "xxlimited_35", "_ctypes_test", "_test*")
TEST_DIRS_ONLY = FileNameSet("test", "tests")
@@ -100,17 +97,11 @@ def get_lib_layout(ns):
else:
if f in TCLTK_FILES_ONLY:
return ns.include_tcltk
- if f in BDIST_WININST_FILES_ONLY:
- return ns.include_bdist_wininst
return True
for dest, src in rglob(ns.source / "Lib", "**/*", _c):
yield dest, src
- if not ns.include_bdist_wininst:
- src = ns.source / BDIST_WININST_STUB
- yield Path("distutils/command/bdist_wininst.py"), src
-
def get_tcltk_lib(ns):
if not ns.include_tcltk:
diff --git a/PC/layout/support/distutils.command.bdist_wininst.py b/PC/layout/support/distutils.command.bdist_wininst.py
deleted file mode 100644
index 6e9b49f..0000000
--- a/PC/layout/support/distutils.command.bdist_wininst.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""distutils.command.bdist_wininst
-
-Suppress the 'bdist_wininst' command, while still allowing
-setuptools to import it without breaking."""
-
-from distutils.core import Command
-from distutils.errors import DistutilsPlatformError
-
-
-class bdist_wininst(Command):
- description = "create an executable installer for MS Windows"
-
- # Marker for tests that we have the unsupported bdist_wininst
- _unsupported = True
-
- def initialize_options(self):
- pass
-
- def finalize_options(self):
- pass
-
- def run(self):
- raise DistutilsPlatformError(
- "bdist_wininst is not supported in this Python distribution"
- )
diff --git a/PC/layout/support/options.py b/PC/layout/support/options.py
index 5e1543b..9faf20c 100644
--- a/PC/layout/support/options.py
+++ b/PC/layout/support/options.py
@@ -26,7 +26,6 @@ OPTIONS = {
"venv": {"help": "venv"},
"dev": {"help": "headers and libs"},
"symbols": {"help": "symbols"},
- "bdist-wininst": {"help": "bdist_wininst support"},
"underpth": {"help": "a python._pth file", "not-in-all": True},
"launchers": {"help": "specific launchers"},
"appxmanifest": {"help": "an appxmanifest"},
@@ -81,7 +80,6 @@ PRESETS = {
"venv",
"dev",
"symbols",
- "bdist-wininst",
"chm",
],
},