diff options
| -rwxr-xr-x | EasyInstall.txt | 9 | ||||
| -rwxr-xr-x | README.txt | 4 | ||||
| -rwxr-xr-x | ez_setup.py | 2 | ||||
| -rwxr-xr-x | setup.py | 2 | ||||
| -rwxr-xr-x | setuptools.txt | 2 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 2 | ||||
| -rwxr-xr-x | setuptools/command/upload.py | 2 | ||||
| -rwxr-xr-x | setuptools/package_index.py | 2 |
8 files changed, 14 insertions, 11 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index 404789c4..f8f5ca57 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -64,7 +64,7 @@ download the setuptools egg. 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. @@ -794,9 +794,9 @@ Command-Line Options 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 @@ -1236,6 +1236,9 @@ Release Notes/Change History 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. @@ -88,9 +88,9 @@ Downloads ========= 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 diff --git a/ez_setup.py b/ez_setup.py index fba091fd..494e8419 100755 --- a/ez_setup.py +++ b/ez_setup.py @@ -15,7 +15,7 @@ This file can also be run as a script to install or upgrade setuptools. """ 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', @@ -23,7 +23,7 @@ setup( 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']}, diff --git a/setuptools.txt b/setuptools.txt index 226caeb7..48a07c6a 100755 --- a/setuptools.txt +++ b/setuptools.txt @@ -2354,7 +2354,7 @@ The ``upload`` command has a few options worth noting: ``--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). ------------------------------------ diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index c21307e3..c1d2fe4f 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -156,7 +156,7 @@ class easy_install(Command): 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: diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py index 685ce43b..e91b8540 100755 --- a/setuptools/command/upload.py +++ b/setuptools/command/upload.py @@ -20,7 +20,7 @@ class upload(Command): description = "upload binary package to PyPI" - DEFAULT_REPOSITORY = 'http://www.python.org/pypi' + DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi' user_options = [ ('repository=', 'r', diff --git a/setuptools/package_index.py b/setuptools/package_index.py index d558b648..fed36a88 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -149,7 +149,7 @@ user_agent = "Python-urllib/%s setuptools/%s" % ( 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) |