summaryrefslogtreecommitdiff
path: root/README.txt
diff options
context:
space:
mode:
Diffstat (limited to 'README.txt')
-rwxr-xr-xREADME.txt58
1 files changed, 16 insertions, 42 deletions
diff --git a/README.txt b/README.txt
index 12b1e390..07bdbc2e 100755
--- a/README.txt
+++ b/README.txt
@@ -5,36 +5,6 @@ Installing and Using Setuptools
.. contents:: **Table of Contents**
-----------------------------------
-Security Issues - Read this First!
-----------------------------------
-
-Setuptools and ``easy_install`` currently default to allowing automated
-download and execution of code from anywhere on the internet, without actually
-verifying the owners of the websites or the authors of the code. If you want
-your installation to be more secure, you will need to:
-
- 1. Manually install the `requests <https://pypi.python.org/pypi/requests>`_
- library **after** installing setuptools, using an SSL-enabled browser or
- other tool. (This will enable SSL certificate verification.)
-
- 2. Configure your default ``--allow-hosts`` setting so that ``easy_install``
- will only download from sites you trust. (E.g., to only download from
- ``pypi.python.org`` or some other trusted package index.)
-
- 3. If you are using a Python version less than 2.6, you will also need to
- install the `SSL backport module <https://pypi.python.org/pypi/requests>`_
- to enable SSL downloads from PyPI. (Unfortunately, the ``requests``
- package does not support older versions of Python at this time, so SSL
- certificate verification will not be enabled. But at least you'll still be
- able to use PyPI, which is in the process of switching to an all-SSL policy
- for downloads.
-
-For more information on how to do all of the above, and for other security-
-related information, please see the full `setuptools security documentation
-<http://peak.telecommunity.com/DevCenter/SetuptoolsSecurity>`_.
-
-
-------------------------
Installation Instructions
-------------------------
@@ -46,15 +16,19 @@ Windows
Install setuptools using the provided ``.exe`` installer.
64-bit versions of Python
- Download `ez_setup.py`_ and run it; it will download the appropriate .egg file and install it for you. (Currently, the provided ``.exe`` installer does not support 64-bit versions of Python for Windows, due to a `distutils installer compatibility issue`_
+ Download `ez_setup.py`_ and run it; it will download the appropriate .egg
+ file and install it for you. (Currently, the provided ``.exe`` installer
+ does not support 64-bit versions of Python for Windows, due to a
+ `distutils installer compatibility issue`_
-.. _ez_setup.py: http://peak.telecommunity.com/dist/ez_setup.py
+.. _ez_setup.py: https://bitbucket.org/pypa/setuptools/raw/default/ez_setup.py
.. _distutils installer compatibility issue: http://bugs.python.org/issue6792
NOTE: Regardless of what sort of Python you're using, if you've previously
-installed older versions of setuptools, please delete all ``setuptools*.egg``
-and ``setuptools.pth`` files from your system's ``site-packages`` directory
+installed older versions of setuptools or distribute, please delete all
+``setuptools*.egg``, ``distribute*.egg``, and ``setuptools.pth`` files and
+directories from your system's ``site-packages`` directory
(and any other ``sys.path`` directories) FIRST.
If you are upgrading a previous version of setuptools that was installed using
@@ -132,8 +106,8 @@ Package Index`_. Scroll to the very bottom of the page to find the links.
.. _the project's home page in the Python Package Index: http://pypi.python.org/pypi/setuptools#files
-In addition to the PyPI downloads, the development version of ``setuptools``
-is available from the `Python SVN sandbox`_, and in-development versions of the
+In addition to the PyPI downloads, the development version of ``setuptools``
+is available from the `Python SVN sandbox`_, and in-development versions of the
`0.6 branch`_ are available as well.
.. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06
@@ -160,12 +134,12 @@ them there, so this reference list can be updated. If you have working,
*tested* patches to correct problems or add features, you may submit them to
the `setuptools bug tracker`_.
-.. _setuptools bug tracker: http://bugs.python.org/setuptools/
-.. _Package Compatibility Notes: http://peak.telecommunity.com/DevCenter/PackageNotes
-.. _The Internal Structure of Python Eggs: http://peak.telecommunity.com/DevCenter/EggFormats
-.. _The setuptools Developer's Guide: http://peak.telecommunity.com/DevCenter/setuptools
-.. _The pkg_resources API reference: http://peak.telecommunity.com/DevCenter/PkgResources
-.. _The EasyInstall user's guide and reference manual: http://peak.telecommunity.com/DevCenter/EasyInstall
+.. _setuptools bug tracker: https://bitbucket.org/pypa/setuptools/issues
+.. _Package Compatibility Notes: https://pythonhosted.org/setuptools/PackageNotes
+.. _The Internal Structure of Python Eggs: https://pythonhosted.org/setuptools/formats.html
+.. _The setuptools Developer's Guide: https://pythonhosted.org/setuptools/setuptools.html
+.. _The pkg_resources API reference: https://pythonhosted.org/setuptools/pkg_resources.html
+.. _The EasyInstall user's guide and reference manual: https://pythonhosted.org/setuptools/easy_install.html
.. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/