Add wheel support.

diff --git a/scripts/make-release.py b/scripts/make-release.py
index 2c2cbb61525da1beb424b954c8a9409339bcc1a8..c28eb9f03748356db3c5b069181d62018356ffa3 100644 (file)
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -16,6 +16,10 @@ import re
 from datetime import datetime, date
 from subprocess import Popen, PIPE
 
+try:
+    import wheel
+except ImportError:
+    wheel = None
 
 _date_strip_re = re.compile(r'(?<=\d)(st|nd|rd|th)')
 
@@ -88,7 +92,10 @@ def set_setup_version(version):
 
 
 def build_and_upload():
-    Popen([sys.executable, 'setup.py', 'release', 'sdist', 'upload']).wait()
+    cmd = [sys.executable, 'setup.py', 'release', 'sdist', 'upload']
+    if wheel is not None:
+        cmd.insert(4, 'bdist_wheel')
+    Popen(cmd).wait()
 
 
 def fail(message, *args):
@@ -140,6 +147,10 @@ def main():
     if not git_is_clean():
         fail('You have uncommitted changes in git')
 
+    if wheel is None:
+        print ('Warning: You need to install the wheel package '
+               'to upload a wheel distribution.')
+
     set_init_version(version)
     set_setup_version(version)
     make_git_commit('Bump version number to %s', version)

diff --git a/setup.cfg b/setup.cfg
index 2d74c58f248790e34e482eb07e20ec6c753c9d2d..b0c20ba8dbda1a46c1daeb829fe9c5c5462c2534 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,6 @@
+[wheel]
+universal = 1
+
 [egg_info]
 tag_build = dev
 tag_date = true