diff options
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | docs/easy_install.txt | 2 | ||||
| -rw-r--r-- | docs/pkg_resources.txt | 2 | ||||
| -rw-r--r-- | docs/setuptools.txt | 6 | ||||
| -rw-r--r-- | ez_setup.py | 2 | ||||
| -rw-r--r-- | pkg_resources.py | 2 | ||||
| -rwxr-xr-x | setup.py | 8 | ||||
| -rw-r--r-- | setuptools/version.py | 2 |
8 files changed, 15 insertions, 16 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index b20d1683..1331de95 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,13 @@ CHANGES ======= +--- +2.0 +--- + +* Issue #41: Dropped support for Python 2.4 and Python 2.5. Clients requiring + setuptools for those versions of Python should use setuptools 1.x. + ----- 1.4.1 ----- diff --git a/docs/easy_install.txt b/docs/easy_install.txt index a69ddd59..6739ba16 100644 --- a/docs/easy_install.txt +++ b/docs/easy_install.txt @@ -35,7 +35,7 @@ Please see the `setuptools PyPI page <https://pypi.python.org/pypi/setuptools>`_ for download links and basic installation instructions for each of the supported platforms. -You will need at least Python 2.4. An ``easy_install`` script will be +You will need at least Python 2.6. An ``easy_install`` script will be installed in the normal location for Python scripts on your platform. Note that the instructions on the setuptools PyPI page assume that you are diff --git a/docs/pkg_resources.txt b/docs/pkg_resources.txt index 3aac4720..8dd3e9ab 100644 --- a/docs/pkg_resources.txt +++ b/docs/pkg_resources.txt @@ -975,7 +975,7 @@ parsed_version py_version The major/minor Python version the distribution supports, as a string. - For example, "2.3" or "2.4". The default is the current version of Python. + For example, "2.7" or "3.4". The default is the current version of Python. platform A string representing the platform the distribution is intended for, or diff --git a/docs/setuptools.txt b/docs/setuptools.txt index dfa9ecdd..9bc8ea44 100644 --- a/docs/setuptools.txt +++ b/docs/setuptools.txt @@ -3,9 +3,9 @@ Building and Distributing Packages with Setuptools ================================================== ``Setuptools`` is a collection of enhancements to the Python ``distutils`` -(for Python 2.3.5 and up on most platforms; 64-bit platforms require a minimum -of Python 2.4) that allow you to more easily build and distribute Python -packages, especially ones that have dependencies on other packages. +(for Python 2.6 and up) that allow developers to more easily build and +distribute Python packages, especially ones that have dependencies on other +packages. Packages built and distributed using ``setuptools`` look to the user like ordinary Python packages based on the ``distutils``. Your users don't need to diff --git a/ez_setup.py b/ez_setup.py index 9dc2c872..a6f48158 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -29,7 +29,7 @@ try: except ImportError: USER_SITE = None -DEFAULT_VERSION = "1.4.2" +DEFAULT_VERSION = "2.0" DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/" def _python_cmd(*args): diff --git a/pkg_resources.py b/pkg_resources.py index 02976016..2c19898b 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -716,7 +716,7 @@ class Environment(object): `platform` is an optional string specifying the name of the platform that platform-specific distributions must be compatible with. If unspecified, it defaults to the current platform. `python` is an - optional string naming the desired version of Python (e.g. ``'2.4'``); + optional string naming the desired version of Python (e.g. ``'3.3'``); it defaults to the current version. You may explicitly set `platform` (and/or `python`) to ``None`` if you @@ -169,8 +169,6 @@ setup_params = dict( License :: OSI Approved :: Python Software Foundation License License :: OSI Approved :: Zope Public License Operating System :: OS Independent - Programming Language :: Python :: 2.4 - Programming Language :: Python :: 2.5 Programming Language :: Python :: 2.6 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 @@ -184,17 +182,11 @@ setup_params = dict( """).strip().splitlines(), extras_require = { "ssl:sys_platform=='win32'": "wincertstore==0.1", - "ssl:sys_platform=='win32' and python_version=='2.4'": "ctypes==1.0.2", - "ssl:python_version in '2.4, 2.5'":"ssl==1.16", "certs": "certifi==0.0.8", }, dependency_links = [ 'https://pypi.python.org/packages/source/c/certifi/certifi-0.0.8.tar.gz#md5=dc5f5e7f0b5fc08d27654b17daa6ecec', - 'https://pypi.python.org/packages/source/s/ssl/ssl-1.16.tar.gz#md5=fb12d335d56f3c8c7c1fefc1c06c4bfb', 'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.1.zip#md5=2f9accbebe8f7b4c06ac7aa83879b81c', - 'https://bitbucket.org/pypa/setuptools/downloads/ctypes-1.0.2.win32-py2.4.exe#md5=9092a0ad5a3d79fa2d980f1ddc5e9dbc', - 'https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.4-win32.egg#md5=3cfa2c526dc66e318e8520b6f1aadce5', - 'https://bitbucket.org/pypa/setuptools/downloads/ssl-1.16-py2.5-win32.egg#md5=85ad1cda806d639743121c0bbcb5f39b', ], scripts = [], # tests_require = "setuptools[ssl]", diff --git a/setuptools/version.py b/setuptools/version.py index 98d186be..3b3dacb9 100644 --- a/setuptools/version.py +++ b/setuptools/version.py @@ -1 +1 @@ -__version__ = '1.4.2' +__version__ = '2.0' |