Skip to content

Commit 2a854be

Browse files
committed
Remove more references to bdist_wininst.
1 parent e6062a1 commit 2a854be

File tree

6 files changed

+3
-110
lines changed

6 files changed

+3
-110
lines changed

distutils/command/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
'bdist',
2121
'bdist_dumb',
2222
'bdist_rpm',
23-
'bdist_wininst',
2423
'check',
2524
'upload',
2625
]

distutils/tests/test_bdist.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ def test_skip_build(self):
4545
names.append('bdist_msi')
4646

4747
for name in names:
48-
with warnings.catch_warnings():
49-
warnings.filterwarnings(
50-
'ignore', 'bdist_wininst command is deprecated', DeprecationWarning
51-
)
52-
subcmd = cmd.get_finalized_command(name)
48+
subcmd = cmd.get_finalized_command(name)
5349
if getattr(subcmd, '_unsupported', False):
5450
# command is not supported on this build
5551
continue

docs/distutils/apiref.rst

+1-15
Original file line numberDiff line numberDiff line change
@@ -1862,8 +1862,7 @@ Subclasses of :class:`Command` must define the following methods.
18621862

18631863
.. _Windows Installer: https://msdn.microsoft.com/en-us/library/cc185688(VS.85).aspx
18641864

1865-
In most cases, the ``bdist_msi`` installer is a better choice than the
1866-
``bdist_wininst`` installer, because it provides better support for
1865+
The ``bdist_msi`` installer provides better support for
18671866
Win64 platforms, allows administrators to perform non-interactive
18681867
installations, and allows installation through group policies.
18691868

@@ -1878,19 +1877,6 @@ Subclasses of :class:`Command` must define the following methods.
18781877
.. % todo
18791878
18801879
1881-
:mod:`distutils.command.bdist_wininst` --- Build a Windows installer
1882-
====================================================================
1883-
1884-
.. module:: distutils.command.bdist_wininst
1885-
:synopsis: Build a Windows installer
1886-
1887-
.. deprecated:: 3.8
1888-
Use bdist_wheel (wheel packages) instead.
1889-
1890-
1891-
.. % todo
1892-
1893-
18941880
:mod:`distutils.command.sdist` --- Build a source distribution
18951881
==============================================================
18961882

docs/distutils/builtdist.rst

+1-77
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,9 @@ generated by each, are:
141141
+--------------------------+-------------------------------------+
142142
| :command:`bdist_rpm` | rpm, srpm |
143143
+--------------------------+-------------------------------------+
144-
| :command:`bdist_wininst` | wininst |
145-
+--------------------------+-------------------------------------+
146144
| :command:`bdist_msi` | msi |
147145
+--------------------------+-------------------------------------+
148146

149-
.. note::
150-
bdist_wininst is deprecated since Python 3.8.
151-
152147
.. note::
153148
bdist_msi is deprecated since Python 3.9.
154149

@@ -191,7 +186,7 @@ easily specify multiple formats in one run. If you need to do both, you can
191186
explicitly specify multiple :command:`bdist_\*` commands and their options::
192187

193188
python setup.py bdist_rpm --packager="John Doe <[email protected]>" \
194-
bdist_wininst --target-version="2.0"
189+
bdist_dumb --dumb-option=foo
195190

196191
Creating RPM packages is driven by a :file:`.spec` file, much as using the
197192
Distutils is driven by the setup script. To make your life easier, the
@@ -298,62 +293,6 @@ file winds up deep in the "build tree," in a temporary directory created by
298293
.. % \command{bdist\_rpm} command with one that writes whatever else you want
299294
.. % to the \file{.spec} file.)
300295
301-
302-
.. _creating-wininst:
303-
304-
Creating Windows Installers
305-
===========================
306-
307-
.. warning::
308-
bdist_wininst is deprecated since Python 3.8.
309-
310-
.. warning::
311-
bdist_msi is deprecated since Python 3.9.
312-
313-
Executable installers are the natural format for binary distributions on
314-
Windows. They display a nice graphical user interface, display some information
315-
about the module distribution to be installed taken from the metadata in the
316-
setup script, let the user select a few options, and start or cancel the
317-
installation.
318-
319-
Since the metadata is taken from the setup script, creating Windows installers
320-
is usually as easy as running::
321-
322-
python setup.py bdist_wininst
323-
324-
or the :command:`bdist` command with the :option:`!--formats` option::
325-
326-
python setup.py bdist --formats=wininst
327-
328-
If you have a pure module distribution (only containing pure Python modules and
329-
packages), the resulting installer will be version independent and have a name
330-
like :file:`foo-1.0.win32.exe`. Note that creating ``wininst`` binary
331-
distributions in only supported on Windows systems.
332-
333-
If you have a non-pure distribution, the extensions can only be created on a
334-
Windows platform, and will be Python version dependent. The installer filename
335-
will reflect this and now has the form :file:`foo-1.0.win32-py2.0.exe`. You
336-
have to create a separate installer for every Python version you want to
337-
support.
338-
339-
The installer will try to compile pure modules into :term:`bytecode` after installation
340-
on the target system in normal and optimizing mode. If you don't want this to
341-
happen for some reason, you can run the :command:`bdist_wininst` command with
342-
the :option:`!--no-target-compile` and/or the :option:`!--no-target-optimize`
343-
option.
344-
345-
By default the installer will display the cool "Python Powered" logo when it is
346-
run, but you can also supply your own 152x261 bitmap which must be a Windows
347-
:file:`.bmp` file with the :option:`!--bitmap` option.
348-
349-
The installer will also display a large title on the desktop background window
350-
when it is run, which is constructed from the name of your distribution and the
351-
version number. This can be changed to another text by using the
352-
:option:`!--title` option.
353-
354-
The installer file will be written to the "distribution directory" --- normally
355-
:file:`dist/`, but customizable with the :option:`!--dist-dir` option.
356-
357296
.. _cross-compile-windows:
358297

359298
Cross-compiling on Windows
@@ -462,18 +401,3 @@ built-in functions in the installation script.
462401
and *iconindex* is the index of the icon in the file *iconpath*. Again, for
463402
details consult the Microsoft documentation for the :class:`IShellLink`
464403
interface.
465-
466-
467-
Vista User Access Control (UAC)
468-
===============================
469-
470-
Starting with Python 2.6, bdist_wininst supports a :option:`!--user-access-control`
471-
option. The default is 'none' (meaning no UAC handling is done), and other
472-
valid values are 'auto' (meaning prompt for UAC elevation if Python was
473-
installed for all users) and 'force' (meaning always prompt for elevation).
474-
475-
.. note::
476-
bdist_wininst is deprecated since Python 3.8.
477-
478-
.. note::
479-
bdist_msi is deprecated since Python 3.9.

docs/distutils/commandref.rst

-1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,5 @@ anything except backslash or colon.
101101
.. % \subsection{\protect\command{bdist}}
102102
.. % \subsection{\protect\command{bdist\_dumb}}
103103
.. % \subsection{\protect\command{bdist\_rpm}}
104-
.. % \subsection{\protect\command{bdist\_wininst}}
105104
106105

docs/distutils/introduction.rst

-11
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,6 @@ the setup script. The difference is which Distutils *commands* they use: the
112112
:command:`install` is more often for installers (although most developers will
113113
want to install their own code occasionally).
114114

115-
If you want to make things really easy for your users, you can create one or
116-
more built distributions for them. For instance, if you are running on a
117-
Windows machine, and want to make things easy for other Windows users, you can
118-
create an executable installer (the most appropriate type of built distribution
119-
for this platform) with the :command:`bdist_wininst` command. For example::
120-
121-
python setup.py bdist_wininst
122-
123-
will create an executable installer, :file:`foo-1.0.win32.exe`, in the current
124-
directory.
125-
126115
Other useful built distribution formats are RPM, implemented by the
127116
:command:`bdist_rpm` command, Solaris :program:`pkgtool`
128117
(:command:`bdist_pkgtool`), and HP-UX :program:`swinstall`

0 commit comments

Comments
 (0)