[Python-checkins] python/nondist/sandbox/setuptools EasyInstall.txt, 1.25, 1.26 ez_setup.py, 1.11, 1.12 setup.py, 1.20, 1.21

[pje@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/setuptools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv755

Modified Files:
	EasyInstall.txt ez_setup.py setup.py 
Log Message:
Add upload support to setuptools, and make default downloads of setuptools 
come from PyPI/python.org rather than from telecommunity.com.  Bump to
version 0.5a7.


Index: EasyInstall.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/EasyInstall.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- EasyInstall.txt	7 Jul 2005 02:10:14 -0000	1.25
+++ EasyInstall.txt	7 Jul 2005 16:28:43 -0000	1.26
@@ -23,13 +23,10 @@
 -------------------------
 
 Windows users can just download and run the `setuptools binary installer for
-Windows <http://peak.telecommunity.com/dist/setuptools-0.5a6.win32.exe>`_.
+Windows <http://peak.telecommunity.com/dist/setuptools-0.5a7.win32.exe>`_.
 All others should just download `ez_setup.py
 <http://peak.telecommunity.com/dist/ez_setup.py>`_, and run it; this will
-download and install the `Python 2.3 egg`_ or `Python 2.4 egg`_ for you.
-
-.. _Python 2.3 egg: http://peak.telecommunity.com/dist/setuptools-0.5a6-py2.3.egg
-.. _Python 2.4 egg: http://peak.telecommunity.com/dist/setuptools-0.5a6-py2.4.egg
+download and install the appropriate egg for you.
 
 You may receive a message telling you about an obsolete version of
 setuptools being present; if so, you must be sure to delete it entirely, along
@@ -66,7 +63,7 @@
 **Example 2**. Install or upgrade a package by name and version by finding
 links on a given "download page"::
 
-    easy_install -f http://peak.telecommunity.com/dist "setuptools>=0.5a6"
+    easy_install -f http://peak.telecommunity.com/dist "setuptools>=0.5a7"
 
 **Example 3**. Download a source distribution from a specified URL,
 automatically building and installing it::
@@ -491,6 +488,11 @@
    in Exemaker.  So, don't use Exemaker to wrap ``easy_install.py``, or at any
    rate don't expect it to work with all packages.
 
+0.5a7
+ * Added "upload" support for egg and source distributions, including a bug
+   fix for "upload" and a temporary workaround for lack of .egg support in
+   PyPI.
+
 0.5a6
  * Beefed up the "sdist" command so that if you don't have a MANIFEST.in, it
    will include all files under revision control (CVS or Subversion) in the

Index: ez_setup.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/ez_setup.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ez_setup.py	7 Jul 2005 02:10:14 -0000	1.11
+++ ez_setup.py	7 Jul 2005 16:28:43 -0000	1.12
@@ -14,8 +14,8 @@
 This file can also be run as a script to install or upgrade setuptools.
 """
 
-DEFAULT_VERSION = "0.5a6"
-DEFAULT_URL     = "http://peak.telecommunity.com/dist/"
+DEFAULT_VERSION = "0.5a7"
+DEFAULT_URL     = "http://www.python.org/packages/source/s/setuptools/"
 
 import sys, os
 
@@ -91,7 +91,7 @@
     """
     import urllib2, shutil
     egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
-    url = download_base + egg_name
+    url = download_base + egg_name + '.zip'  # XXX
     saveto = os.path.join(to_dir, egg_name)
     src = dst = None
 

Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setup.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- setup.py	7 Jul 2005 02:10:14 -0000	1.20
+++ setup.py	7 Jul 2005 16:28:43 -0000	1.21
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Distutils setup file, used to install or test 'setuptools'"""
 
-VERSION = "0.5a6"
+VERSION = "0.5a7"
 from setuptools import setup, find_packages, Require
 
 setup(
@@ -26,8 +26,7 @@
         "close. See the home page and download page for details and docs.",
 
     keywords = "CPAN PyPI distutils eggs package management",
-    url = "http://peak.telecommunity.com/DevCenter/PythonEggs",
-    download_url = "http://peak.telecommunity.com/DevCenter/EasyInstall",
+    url = "http://peak.telecommunity.com/DevCenter/EasyInstall",
 
     test_suite = 'setuptools.tests.test_suite',
     requires = [
@@ -39,6 +38,7 @@
 
 
 
+
     packages = find_packages(),
     py_modules = ['pkg_resources'],
     scripts = ['easy_install.py'],