Merge pull request #2067 from minrk/release_windows

update tools/release_windows.py

setup.py

@@ -52,6 +52,7 b' from glob import glob'
 if os.path.exists('MANIFEST'): os.remove('MANIFEST')
 
 from distutils.core import setup
+from distutils.command.upload import upload
 
 # On Python 3, we need distribute (new setuptools) to do the 2to3 conversion
 if PY3:
@@ -171,6 +172,31 b" setup_args['package_data'] = package_data"
 setup_args['data_files'] = data_files
 
 #---------------------------------------------------------------------------
+# custom upload_wininst command
+#---------------------------------------------------------------------------
+
+class UploadWindowsInstallers(upload):
+    
+    description = "Upload Windows installers to PyPI (only used from tools/release_windows.py)"
+    user_options = upload.user_options + [
+        ('files=', 'f', 'exe file (or glob) to upload')
+    ]
+    def initialize_options(self):
+        upload.initialize_options(self)
+        meta = self.distribution.metadata
+        base = '{name}-{version}'.format(
+            name=meta.get_name(),
+            version=meta.get_version()
+        )
+        self.files = os.path.join('dist', '%s.*.exe' % base)
+    
+    def run(self):
+        for dist_file in glob(self.files):
+            self.upload_file('bdist_wininst', 'any', dist_file)
+
+setup_args['cmdclass']['upload_wininst'] = UploadWindowsInstallers
+
+#---------------------------------------------------------------------------
 # Handle scripts, dependencies, and setuptools specific things
 #---------------------------------------------------------------------------
 

tools/release_windows.py

@@ -23,10 +23,10 b' except ImportError:'
 
 github = '--github' in sys.argv
 
-cmd_t = "{py} setup.py bdist_wininst --plat-name=py{v}-{plat}"
+cmd_t = "{py} setup.py bdist_wininst --plat-name={plat}"
 
-if '--pypi' in sys.argv:
-    cmd_t += ' --upload'
+pypi = '--pypi' in sys.argv
+pypi_cmd_t = "python setup.py upload_wininst -f {fname}"
 
 for py in ['python', 'python3']:
     # deliberately mangle the name,
@@ -36,11 +36,17 b" for py in ['python', 'python3']:"
         shutil.rmtree('build')
     except OSError:
         pass
-    for plat in ['32b-Windows', '64b-Windows']:
+    for plat in ['win32', 'win-amd64']:
         cmd = cmd_t.format(**locals())
         sh(cmd)
+        orig = glob.glob(os.path.join('dist', 'ipython-*.{plat}.exe'.format(**locals())))[0]
+        mangled = orig.replace('.{plat}.exe'.format(**locals()),
+                               '.py{v}-{plat}.exe'.format(**locals())
+        )
+        os.rename(orig, mangled)
+        if pypi:
+            sh(pypi_cmd_t.format(fname=mangled))
         if github and gh_api:
-            exe = glob.glob(os.path.join("dist", "ipython-*{v}-{plat}.exe".format(**locals())))[0]
-            print ("Uploading %s to GitHub" % exe)
+            print ("Uploading %s to GitHub" % mangled)
             desc = "IPython Installer for Python {v}.x on {plat}".format(**locals())
-            gh_api.post_download('ipython/ipython', exe, description=desc)
+            gh_api.post_download('ipython/ipython', mangled, description=desc)