From 07ebbbd6b46c69c02aa3f1d3afab4b4fb52d7166 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 31 Dec 2013 05:23:21 +0000
Subject: [PATCH] =?UTF-8?q?remove=20=E2=80=9C-src=E2=80=9D=20from=20the=20?=
 =?UTF-8?q?source=20tarball=20name=20so=20it=20matches=20what=20setuptools?=
 =?UTF-8?q?=20and=20pip=20expect=20it=20to=20be.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build.py |  2 +-
 setup.py | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/build.py b/build.py
index d8dca9dc..ea0b1c52 100755
--- a/build.py
+++ b/build.py
@@ -1414,7 +1414,7 @@ def cmd_sdist(options, args):
             
     # build the tarball
     msg('Archiving Phoenix source...')
-    rootname = "%s-%s-src" % (baseName, cfg.VERSION)
+    rootname = "%s-%s" % (baseName, cfg.VERSION)
     tarfilename = "dist/%s.tar.gz" % rootname
     if os.path.exists(tarfilename):
         os.remove(tarfilename)
diff --git a/setup.py b/setup.py
index bd086b51..e121fef5 100644
--- a/setup.py
+++ b/setup.py
@@ -59,12 +59,13 @@ CLASSIFIERS      = """\
 Development Status :: 6 - Mature
 Environment :: MacOS X :: Cocoa
 Environment :: Win32 (MS Windows)
-Environment :: Win64 (MS Windows)
 Environment :: X11 Applications :: GTK
 Intended Audience :: Developers
 License :: OSI Approved
 Operating System :: MacOS :: MacOS X
-Operating System :: Microsoft :: Windows :: Windows 2000/XP/Vista/7/8
+Operating System :: Microsoft :: Windows :: Windows XP
+Operating System :: Microsoft :: Windows :: Windows Vista
+Operating System :: Microsoft :: Windows :: Windows 7
 Operating System :: POSIX
 Programming Language :: Python
 Topic :: Software Development :: User Interfaces
@@ -186,8 +187,15 @@ class wx_sdist(orig_sdist):
         cmd = [sys.executable, '-u', 'build.py', 'sdist']
         cmd = ' '.join(cmd)
         runcmd(cmd)
+        
+        # Put the filename in dist_files in case the upload command is used.
+        # On the other hand, PyPI's upload size limit is waaaaaaaaay too
+        # small so it probably doesn't matter too much...
+        sdist_file = opj(self.dist_dir, self.distribution.get_fullname()+'.tar.gz')
+        self.distribution.dist_files.append(('sdist', '', sdist_file))
 
-    
+
+   
 
 # Map these new classes to the appropriate distutils command names.
 CMDCLASS = {