Remove bdist_wininst

Fixes pypa#2558
hroncok · Feb 12, 2021 · 84ef0ae · 84ef0ae
1 parent c121d28
commit 84ef0ae
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 57 deletions.
diff --git a/pytest.ini b/pytest.ini
@@ -12,8 +12,6 @@ filterwarnings=
     ignore:direct construction of .*Item has been deprecated:DeprecationWarning
     # Fail on warnings
     error
-    # https://github.com/pypa/setuptools/issues/1823
-    ignore:bdist_wininst command is deprecated
     # Suppress this error; unimportant for CI tests
     ignore:Extraction path is writable by group/others:UserWarning
     # Suppress weird RuntimeWarning.

diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py
@@ -2,7 +2,7 @@
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
     'sdist', 'setopt', 'test', 'install_egg_info', 'install_scripts',
-    'bdist_wininst', 'upload_docs', 'build_clib', 'dist_info',
+    'upload_docs', 'build_clib', 'dist_info',
 ]
 
 from distutils.command.bdist import bdist

diff --git a/setuptools/command/bdist_wininst.py b/setuptools/command/bdist_wininst.py
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
@@ -1,5 +1,6 @@
 from distutils import log
 import distutils.command.install_scripts as orig
+from distutils.errors import DistutilsModuleError
 import os
 import sys
 
@@ -35,7 +36,7 @@ def run(self):
         try:
             bw_cmd = self.get_finalized_command("bdist_wininst")
             is_wininst = getattr(bw_cmd, '_is_running', False)
-        except ImportError:
+        except (ImportError, DistutilsModuleError):
             is_wininst = False
         writer = ei.ScriptWriter
         if is_wininst:

diff --git a/setuptools/tests/test_bdist_deprecations.py b/setuptools/tests/test_bdist_deprecations.py