diff options
| author | Jeremy Stanley <fungi@yuggoth.org> | 2020-06-14 00:05:22 +0000 |
|---|---|---|
| committer | Jeremy Stanley <fungi@yuggoth.org> | 2020-08-27 17:01:31 +0000 |
| commit | e52e608e35938da27dd9ec7209e4fa858ed8adb6 (patch) | |
| tree | a8fc9c5d9ae7d54f223cb26c3881f50eb98335fc | |
| parent | bf28efb2639eea560008fd77d9a40d11a82246ce (diff) | |
| download | pbr-e52e608e35938da27dd9ec7209e4fa858ed8adb6.tar.gz | |
Remove bdist_wininst support
Odds are this was never used, but as of Python 3.8 and Setuptools
47.2 it's deprecated in favor of just using wheels for Windows
platform packaging anyway.
https://discuss.python.org/t/deprecate-bdist-wininst/
https://discuss.python.org/t/remove-distutils-bdist-wininst-command/
Change-Id: I3840d9fccb1f87be5c2c03470e156559c01b7cd6
| -rw-r--r-- | pbr/packaging.py | 16 | ||||
| -rw-r--r-- | releasenotes/notes/bdist_wininst-removal-4a1c7c3a9f08238d.yaml | 9 |
2 files changed, 15 insertions, 10 deletions
diff --git a/pbr/packaging.py b/pbr/packaging.py index 68747b6..90b9933 100644 --- a/pbr/packaging.py +++ b/pbr/packaging.py @@ -431,9 +431,9 @@ def generate_script(group, entry_point, header, template): def override_get_script_args( - dist, executable=os.path.normpath(sys.executable), is_wininst=False): + dist, executable=os.path.normpath(sys.executable)): """Override entrypoints console_script.""" - header = easy_install.get_script_header("", executable, is_wininst) + header = easy_install.get_script_header("", executable) for group, template in ENTRY_POINTS_MAP.items(): for name, ep in dist.get_entry_map(group).items(): yield (name, generate_script(group, ep, header, template)) @@ -455,12 +455,12 @@ class LocalInstallScripts(install_scripts.install_scripts): """Intercepts console scripts entry_points.""" command_name = 'install_scripts' - def _make_wsgi_scripts_only(self, dist, executable, is_wininst): + def _make_wsgi_scripts_only(self, dist, executable): # get_script_header() is deprecated since Setuptools 12.0 try: header = easy_install.ScriptWriter.get_header("", executable) except AttributeError: - header = easy_install.get_script_header("", executable, is_wininst) + header = easy_install.get_script_header("", executable) wsgi_script_template = ENTRY_POINTS_MAP['wsgi_scripts'] for name, ep in dist.get_entry_map('wsgi_scripts').items(): content = generate_script( @@ -486,16 +486,12 @@ class LocalInstallScripts(install_scripts.install_scripts): bs_cmd = self.get_finalized_command('build_scripts') executable = getattr( bs_cmd, 'executable', easy_install.sys_executable) - is_wininst = getattr( - self.get_finalized_command("bdist_wininst"), '_is_running', False - ) - if 'bdist_wheel' in self.distribution.have_run: # We're building a wheel which has no way of generating mod_wsgi # scripts for us. Let's build them. # NOTE(sigmavirus24): This needs to happen here because, as the # comment below indicates, no_ep is True when building a wheel. - self._make_wsgi_scripts_only(dist, executable, is_wininst) + self._make_wsgi_scripts_only(dist, executable) if self.no_ep: # no_ep is True if we're installing into an .egg file or building @@ -509,7 +505,7 @@ class LocalInstallScripts(install_scripts.install_scripts): get_script_args = easy_install.get_script_args executable = '"%s"' % executable - for args in get_script_args(dist, executable, is_wininst): + for args in get_script_args(dist, executable): self.write_script(*args) diff --git a/releasenotes/notes/bdist_wininst-removal-4a1c7c3a9f08238d.yaml b/releasenotes/notes/bdist_wininst-removal-4a1c7c3a9f08238d.yaml new file mode 100644 index 0000000..c3e9410 --- /dev/null +++ b/releasenotes/notes/bdist_wininst-removal-4a1c7c3a9f08238d.yaml @@ -0,0 +1,9 @@ +--- +other: + - | + Support to generate bdist_wininst packages has been removed. As of Python + 3.8 and Setuptools 47.2 it's deprecated in favor of just using wheels for + Windows platform packaging. See + https://discuss.python.org/t/deprecate-bdist-wininst/ and + https://discuss.python.org/t/remove-distutils-bdist-wininst-command/ for + more details. |