1. Don't crash if settings plist is corrupted.

2. Make add_doc_to_wheels catch more of my mistakes.

3. Update stats

Author: NathanDunfield

dev/release_tools/release_steps.rst

@@ -120,6 +120,7 @@ h. Version 3.0(.1): 292 Mac,  434 Windows.
 i. Version 3.0.2:    68 Mac,   70 Windows.
 j. Version 3.0.3:   667 Mac, 1333 Windows. (36% Mac, 64% Windows for 3.0.*)
 h. Version 3.1.*:   883 Mac, 1482 Windows. (37% Mac, 63% Windows)
+k. Version 3.2:     607 Mac,  740 Windows, 134 Linux (41% Mac, 50% Windows, 9% Linux)
 
 Average downloads for 2015-3-22 through 2017-10-26.
 

doc_src/add_doc_to_wheels.py

@@ -14,6 +14,9 @@
 from zipfile import ZipFile
 
 doc_zipfile = os.path.abspath(sys.argv[1])
+if not doc_zipfile.endswith('.zip'):
+    raise ValueError('First argument should be a zipfile')
+
 wheel_names = glob.glob(sys.argv[2] + '/snappy-*.whl')
 if len(wheel_names) == 0:
     raise ValueError('No snappy wheels in wheeldir!')
@@ -40,7 +43,7 @@ def normalize(path):
 
     print('Unpacking docs..')
     with ZipFile(doc_zipfile) as doc_zip:
-        if len({path.split('/')[0] for path in doc_zip.namelist()}) == 1:
+        if len({path.split('/')[0] for path in doc_zip.namelist()}) < 5:
             raise ValueError('doc zipfile has top-level directory, bailing')
 
     subprocess.check_call(['unzip', '-q', doc_zipfile, '-d', target_doc_dir])

python/settings.py

@@ -71,7 +71,10 @@ def find_settings(self):
     def read_settings(self):
         if self.setting_file and os.path.exists(self.setting_file):
             with open(self.setting_file, 'rb') as setting_file:
-                new_settings = plistlib.load(setting_file)
+                try:
+                    new_settings = plistlib.load(setting_file)
+                except: # file has been corrupted, ignore it.
+                    return
 
             if 'font' in new_settings:
                 family, size, info = new_settings['font']