1. Tarek Ziadé
  2. distribute

Commits

phillip.eby  committed 52cb9de

The default ``--index-url`` is now ``http://pypi.python.org/simple``, to
use the Python Package Index's new simpler (and faster!) REST API.
(backport from trunk)

  • Participants
  • Parent commits 609c154
  • Branches setuptools-0.6

Comments (0)

Files changed (8)

File EasyInstall.txt

View file
 
 If you can't use APS, or don't have internet access at all, you will need to
 first download the appropriate ``.egg`` file from the `setuptools PyPI page
-<http://cheeseshop.python.org/pypi/setuptools>`_ using a computer with internet
+<http://pypi.python.org/pypi/setuptools>`_ using a computer with internet
 access.  Place the egg in the same directory as ``ez_setup.py`` on the target
 computer before running it.
 
     installed package to work, like manually adding it to ``PYTHONPATH`` or to
     ``sys.path`` at runtime.
 
-``--index-url=URL, -i URL`` (New in 0.4a1)
+``--index-url=URL, -i URL`` (New in 0.4a1; default changed in 0.6c7)
     Specifies the base URL of the Python Package Index.  The default is
-    http://www.python.org/pypi if not specified.  When a package is requested
+    http://pypi.python.org/simple if not specified.  When a package is requested
     that is not locally available or linked from a ``--find-links`` download
     page, the package index will be searched for download pages for the needed
     package, and those download pages will be searched for links to download
 0.6c7
  * ``ftp:`` download URLs now work correctly.
 
+ * The default ``--index-url`` is now ``http://pypi.python.org/simple``, to use
+   the Python Package Index's new simpler (and faster!) REST API.
+
 0.6c6
  * EasyInstall no longer aborts the installation process if a URL it wants to
    retrieve can't be downloaded, unless the URL is an actual package download.

File README.txt

View file
 =========
 
 All setuptools downloads can be found at `the project's home page in the Python
-Cheese Shop`_.  Scroll to the very bottom of the page to find the links.
+Package Index`_.  Scroll to the very bottom of the page to find the links.
 
-.. _the project's home page in the Python Cheese Shop: http://cheeseshop.python.org/pypi/setuptools
+.. _the project's home page in the Python Package Index: http://pypi.python.org/pypi/setuptools
 
 In addition to the PyPI downloads, the development version of ``setuptools``   
 is available from the `Python SVN sandbox`_, and in-development versions of the 

File ez_setup.py

View file
 """
 import sys
 DEFAULT_VERSION = "0.6c7"
-DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
+DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
 md5_data = {
     'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',

File setup.py

View file
     license="PSF or ZPL",
     long_description = open('README.txt').read(),
     keywords = "CPAN PyPI distutils eggs package management",
-    url = "http://cheeseshop.python.org/pypi/setuptools",
+    url = "http://pypi.python.org/pypi/setuptools",
     test_suite = 'setuptools.tests',
     packages = find_packages(),
     package_data = {'setuptools':['*.exe']},

File setuptools.txt

View file
 
 ``--repository=URL, -r URL``
     The URL of the repository to upload to.  Defaults to
-    http://www.python.org/pypi (i.e., the main PyPI installation).
+    http://pypi.python.org/pypi (i.e., the main PyPI installation).
 
 
 ------------------------------------

File setuptools/command/easy_install.py

View file
                 else:
                     self.all_site_dirs.append(normalize_path(d))
         if not self.editable: self.check_site_dir()
-        self.index_url = self.index_url or "http://cheeseshop.python.org/pypi"
+        self.index_url = self.index_url or "http://pypi.python.org/simple"
         self.shadow_path = self.all_site_dirs[:]
         for path_item in self.install_dir, normalize_path(self.script_dir):
             if path_item not in self.shadow_path:

File setuptools/command/upload.py

View file
 
     description = "upload binary package to PyPI"
 
-    DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
+    DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
 
     user_options = [
         ('repository=', 'r',

File setuptools/package_index.py

View file
 class PackageIndex(Environment):
     """A distribution index that scans web pages for download URLs"""
 
-    def __init__(self, index_url="http://www.python.org/pypi", hosts=('*',),
+    def __init__(self, index_url="http://pypi.python.org/simple", hosts=('*',),
         *args, **kw
     ):
         Environment.__init__(self,*args,**kw)