[Python-checkins] r57964 - in sandbox/trunk/setuptools: EasyInstall.txt README.txt ez_setup.py setup.py setuptools.txt setuptools/command/easy_install.py setuptools/command/upload.py setuptools/package_index.py
phillip.eby
python-checkins at python.org
Tue Sep 4 17:53:19 CEST 2007
Author: phillip.eby
Date: Tue Sep 4 17:53:18 2007
New Revision: 57964
Modified:
sandbox/trunk/setuptools/EasyInstall.txt
sandbox/trunk/setuptools/README.txt
sandbox/trunk/setuptools/ez_setup.py
sandbox/trunk/setuptools/setup.py
sandbox/trunk/setuptools/setuptools.txt
sandbox/trunk/setuptools/setuptools/command/easy_install.py
sandbox/trunk/setuptools/setuptools/command/upload.py
sandbox/trunk/setuptools/setuptools/package_index.py
Log:
Remove all references to the Cheese Shop, and switch to using
the new PyPI "/simple" REST API.
Modified: sandbox/trunk/setuptools/EasyInstall.txt
==============================================================================
--- sandbox/trunk/setuptools/EasyInstall.txt (original)
+++ sandbox/trunk/setuptools/EasyInstall.txt Tue Sep 4 17:53:18 2007
@@ -64,7 +64,7 @@
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 @@
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
Modified: sandbox/trunk/setuptools/README.txt
==============================================================================
--- sandbox/trunk/setuptools/README.txt (original)
+++ sandbox/trunk/setuptools/README.txt Tue Sep 4 17:53:18 2007
@@ -88,9 +88,9 @@
=========
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
Modified: sandbox/trunk/setuptools/ez_setup.py
==============================================================================
--- sandbox/trunk/setuptools/ez_setup.py (original)
+++ sandbox/trunk/setuptools/ez_setup.py Tue Sep 4 17:53:18 2007
@@ -15,7 +15,7 @@
"""
import sys
DEFAULT_VERSION = "0.7a1"
-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.6a10-py2.3.egg': '162d8357f1aff2b0349c6c247ee62987',
Modified: sandbox/trunk/setuptools/setup.py
==============================================================================
--- sandbox/trunk/setuptools/setup.py (original)
+++ sandbox/trunk/setuptools/setup.py Tue Sep 4 17:53:18 2007
@@ -27,7 +27,7 @@
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','site-patch.py']},
Modified: sandbox/trunk/setuptools/setuptools.txt
==============================================================================
--- sandbox/trunk/setuptools/setuptools.txt (original)
+++ sandbox/trunk/setuptools/setuptools.txt Tue Sep 4 17:53:18 2007
@@ -2332,7 +2332,7 @@
``--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).
------------------------------------
Modified: sandbox/trunk/setuptools/setuptools/command/easy_install.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/easy_install.py (original)
+++ sandbox/trunk/setuptools/setuptools/command/easy_install.py Tue Sep 4 17:53:18 2007
@@ -156,7 +156,7 @@
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:
Modified: sandbox/trunk/setuptools/setuptools/command/upload.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/upload.py (original)
+++ sandbox/trunk/setuptools/setuptools/command/upload.py Tue Sep 4 17:53:18 2007
@@ -20,7 +20,7 @@
description = "upload binary package to PyPI"
- DEFAULT_REPOSITORY = 'http://www.python.org/pypi'
+ DEFAULT_REPOSITORY = 'http://pypi.python.org/pypi'
user_options = [
('repository=', 'r',
Modified: sandbox/trunk/setuptools/setuptools/package_index.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/package_index.py (original)
+++ sandbox/trunk/setuptools/setuptools/package_index.py Tue Sep 4 17:53:18 2007
@@ -149,7 +149,7 @@
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)
More information about the Python-checkins
mailing list