aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-11-23 17:53:50 -0500
committerJason R. Coombs <jaraco@jaraco.com>2013-11-23 17:53:50 -0500
commit1e811c32250676cc83e79e4063d5420eb72a8f83 (patch)
tree2e2412ccd73866e15b6ca0f49b2d84bdf155ec1d
parent617ffd19b3e13b46c1ab849ae394fb0ce8a0f6a0 (diff)
downloadexternal_python_setuptools-1e811c32250676cc83e79e4063d5420eb72a8f83.tar.gz
external_python_setuptools-1e811c32250676cc83e79e4063d5420eb72a8f83.tar.bz2
external_python_setuptools-1e811c32250676cc83e79e4063d5420eb72a8f83.zip
Bumped to 1.4.2 in preparation for next release.
-rw-r--r--ez_setup.py2
-rw-r--r--setuptools.egg-info/entry_points.txt66
-rw-r--r--setuptools.egg-info/requires.txt10
-rw-r--r--setuptools/version.py2
4 files changed, 40 insertions, 40 deletions
diff --git a/ez_setup.py b/ez_setup.py
index 79e08962..9dc2c872 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@ try:
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "1.4.1"
+DEFAULT_VERSION = "1.4.2"
DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
def _python_cmd(*args):
diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt
index 0d2df682..2bf6c8ce 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
[distutils.setup_keywords]
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+extras_require = setuptools.dist:check_extras
+install_requires = setuptools.dist:check_requirements
+test_loader = setuptools.dist:check_importable
+use_2to3 = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
convert_2to3_doctests = setuptools.dist:assert_string_list
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-entry_points = setuptools.dist:check_entry_points
+zip_safe = setuptools.dist:assert_bool
include_package_data = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+namespace_packages = setuptools.dist:check_nsp
tests_require = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
use_2to3_fixers = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-zip_safe = setuptools.dist:assert_bool
-extras_require = setuptools.dist:check_extras
packages = setuptools.dist:check_packages
-install_requires = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+package_data = setuptools.dist:check_package_data
dependency_links = setuptools.dist:assert_string_list
exclude_package_data = setuptools.dist:check_package_data
-package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
[egg_info.writers]
-entry_points.txt = setuptools.command.egg_info:write_entries
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
requires.txt = setuptools.command.egg_info:write_requirements
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
top_level.txt = setuptools.command.egg_info:write_toplevel_names
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+entry_points.txt = setuptools.command.egg_info:write_entries
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-
-[console_scripts]
-easy_install-3.3 = setuptools.command.easy_install:main
-easy_install = setuptools.command.easy_install:main
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
[setuptools.installation]
eggsecutable = setuptools.command.easy_install:bootstrap
+[console_scripts]
+easy_install = setuptools.command.easy_install:main
+easy_install-3.3 = setuptools.command.easy_install:main
+
[setuptools.file_finders]
svn_cvs = setuptools.command.sdist:_default_revctrl
[distutils.commands]
-alias = setuptools.command.alias:alias
-build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
rotate = setuptools.command.rotate:rotate
-install = setuptools.command.install:install
-easy_install = setuptools.command.easy_install:easy_install
-setopt = setuptools.command.setopt:setopt
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install_lib = setuptools.command.install_lib:install_lib
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
test = setuptools.command.test:test
-register = setuptools.command.register:register
-egg_info = setuptools.command.egg_info:egg_info
-install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
build_py = setuptools.command.build_py:build_py
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
saveopts = setuptools.command.saveopts:saveopts
+build_ext = setuptools.command.build_ext:build_ext
+install_lib = setuptools.command.install_lib:install_lib
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+easy_install = setuptools.command.easy_install:easy_install
+register = setuptools.command.register:register
+alias = setuptools.command.alias:alias
+install = setuptools.command.install:install
upload_docs = setuptools.command.upload_docs:upload_docs
-sdist = setuptools.command.sdist:sdist
develop = setuptools.command.develop:develop
+install_scripts = setuptools.command.install_scripts:install_scripts
+egg_info = setuptools.command.egg_info:egg_info
install_egg_info = setuptools.command.install_egg_info:install_egg_info
+setopt = setuptools.command.setopt:setopt
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e7f0f3b8..e4fb4954 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,13 +1,13 @@
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2
+
[ssl:sys_platform=='win32']
wincertstore==0.1
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
-
[certs]
certifi==0.0.8
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2 \ No newline at end of file
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16 \ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 8e3c933c..98d186be 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.4.1'
+__version__ = '1.4.2'