Include directory entries when building wheel

tests/test_bdist_wheel.py

@@ -8,6 +8,7 @@
 from wheel.wheelfile import WheelFile
 
 DEFAULT_FILES = {
+    'dummy_dist-1.0.dist-info/',
     'dummy_dist-1.0.dist-info/top_level.txt',
     'dummy_dist-1.0.dist-info/METADATA',
     'dummy_dist-1.0.dist-info/WHEEL',

tests/test_wheelfile.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 import sys
+import operator
 from zipfile import ZipFile, ZIP_DEFLATED
 
 import pytest
@@ -172,3 +173,26 @@ def test_attributes(tmpdir_factory, wheel_path):
         info = zf.getinfo('test-1.0.dist-info/RECORD')
         permissions = (info.external_attr >> 16) & 0o777
         assert permissions == 0o664
+
+
+def test_directories(tmpdir, wheel_path):
+    """
+    The WheelFile should contain entries for directories,
+    empty and not.
+    """
+    build_dir = tmpdir
+    sub_dir = build_dir / 'sub'
+    sub_dir.mkdir()
+    (sub_dir / '__init__.py').write_text('', encoding='utf-8')
+    empty_dir = build_dir / 'empty'
+    empty_dir.mkdir()
+
+    with WheelFile(wheel_path, 'w') as wf:
+        wf.write_files(str(build_dir))
+
+    with ZipFile(wheel_path, 'r') as zf:
+        infos = zf.infolist()
+
+    names = set(map(operator.attrgetter('filename'), infos))
+    assert 'sub/' in names
+    assert 'empty/' in names

wheel/wheelfile.py

@@ -111,6 +111,12 @@ def write_files(self, base_dir):
             # Sort the directory names so that `os.walk` will walk them in a
             # defined order on the next iteration.
             dirnames.sort()
+
+            for name in dirnames:
+                path = os.path.normpath(os.path.join(root, name))
+                arcname = os.path.relpath(path, base_dir)
+                self.mkdir(path, arcname)
+
             for name in sorted(filenames):
                 path = os.path.normpath(os.path.join(root, name))
                 if os.path.isfile(path):
@@ -136,12 +142,19 @@ def write(self, filename, arcname=None, compress_type=None):
         zinfo.compress_type = ZIP_DEFLATED
         self.writestr(zinfo, data, compress_type)
 
+    def mkdir(self, filename, arcname):
+        st = os.stat(filename)
+        zinfo = ZipInfo(arcname + '/', date_time=get_zipinfo_datetime(st.st_mtime))
+        zinfo.external_attr = st.st_mode << 16
+        zinfo.compress_type = ZIP_DEFLATED
+        self.writestr(zinfo, b'')
+
     def writestr(self, zinfo_or_arcname, bytes, compress_type=None):
         ZipFile.writestr(self, zinfo_or_arcname, bytes, compress_type)
         fname = (zinfo_or_arcname.filename if isinstance(zinfo_or_arcname, ZipInfo)
                  else zinfo_or_arcname)
         logger.info("adding '%s'", fname)
-        if fname != self.record_path:
+        if fname != self.record_path and not fname.endswith('/'):
             hash_ = self._default_algorithm(bytes)
             self._file_hashes[fname] = hash_.name, native(urlsafe_b64encode(hash_.digest()))
             self._file_sizes[fname] = len(bytes)