Commit b8e280d2 authored by Éric Araujo's avatar Éric Araujo

Make packaging’ upload command work with bdist_msi products (#13719)

parent d1671239
...@@ -261,7 +261,7 @@ class bdist_msi(Command): ...@@ -261,7 +261,7 @@ class bdist_msi(Command):
self.db.Commit() self.db.Commit()
if hasattr(self.distribution, 'dist_files'): if hasattr(self.distribution, 'dist_files'):
tup = 'bdist_msi', self.target_version or 'any', fullname tup = 'bdist_msi', self.target_version or 'any', installer_name
self.distribution.dist_files.append(tup) self.distribution.dist_files.append(tup)
if not self.keep_temp: if not self.keep_temp:
......
"""Tests for distutils.command.bdist_msi.""" """Tests for distutils.command.bdist_msi."""
import os
import sys import sys
from packaging.tests import unittest, support from packaging.tests import unittest, support
@unittest.skipUnless(sys.platform == 'win32', 'these tests require Windows')
class BDistMSITestCase(support.TempdirManager, class BDistMSITestCase(support.TempdirManager,
support.LoggingCatcher, support.LoggingCatcher,
unittest.TestCase): unittest.TestCase):
@unittest.skipUnless(sys.platform == "win32", "runs only on win32")
def test_minimal(self): def test_minimal(self):
# minimal test XXX need more tests # minimal test XXX need more tests
from packaging.command.bdist_msi import bdist_msi from packaging.command.bdist_msi import bdist_msi
pkg_pth, dist = self.create_dist() project_dir, dist = self.create_dist()
cmd = bdist_msi(dist) cmd = bdist_msi(dist)
cmd.ensure_finalized() cmd.ensure_finalized()
cmd.run()
bdists = os.listdir(os.path.join(project_dir, 'dist'))
self.assertEqual(bdists, ['foo-0.1.msi'])
# bug #13719: upload ignores bdist_msi files
self.assertEqual(dist.dist_files,
[('bdist_msi', 'any', 'dist/foo-0.1.msi')])
def test_suite(): def test_suite():
......
...@@ -13,7 +13,8 @@ Core and Builtins ...@@ -13,7 +13,8 @@ Core and Builtins
Library Library
------- -------
- Issue #13719: Make the distutils upload command aware of bdist_msi products. - Issue #13719: Make the distutils and packaging upload commands aware of
bdist_msi products.
- Issue #14007: Accept incomplete TreeBuilder objects (missing start, end, - Issue #14007: Accept incomplete TreeBuilder objects (missing start, end,
data or close method) for the Python implementation as well. data or close method) for the Python implementation as well.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment