summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-11-03 11:38:19 -0500
committerJason R. Coombs <jaraco@jaraco.com>2013-11-03 11:38:19 -0500
commitc92770125e3f86384d7a0020215dc7a7016af9f7 (patch)
treef53be2d24e2b6b0e4890ab53c36fd1d899bba5a0
parent816b15494393c74219373a268c29a6460a0a636e (diff)
downloadpython-setuptools-git-c92770125e3f86384d7a0020215dc7a7016af9f7.tar.gz
Bumped to 1.4 in preparation for next release.
-rw-r--r--ez_setup.py2
-rw-r--r--setuptools.egg-info/entry_points.txt90
-rw-r--r--setuptools.egg-info/requires.txt8
-rw-r--r--setuptools/version.py2
4 files changed, 51 insertions, 51 deletions
diff --git a/ez_setup.py b/ez_setup.py
index 64eaca55..72d35a5b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@ try:
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "1.3"
+DEFAULT_VERSION = "1.4"
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 718c4787..fdf63bf0 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,62 +1,62 @@
-[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
-[distutils.setup_keywords]
-tests_require = setuptools.dist:check_requirements
-include_package_data = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-use_2to3_fixers = setuptools.dist:assert_string_list
-extras_require = setuptools.dist:check_extras
-test_suite = setuptools.dist:check_test_suite
-namespace_packages = setuptools.dist:check_nsp
-zip_safe = setuptools.dist:assert_bool
-convert_2to3_doctests = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-eager_resources = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
[egg_info.writers]
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-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
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+entry_points.txt = setuptools.command.egg_info:write_entries
requires.txt = setuptools.command.egg_info:write_requirements
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
[distutils.commands]
-test = setuptools.command.test:test
-upload_docs = setuptools.command.upload_docs:upload_docs
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
+install = setuptools.command.install:install
install_lib = setuptools.command.install_lib:install_lib
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-build_py = setuptools.command.build_py:build_py
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-sdist = setuptools.command.sdist:sdist
-develop = setuptools.command.develop:develop
register = setuptools.command.register:register
-setopt = setuptools.command.setopt:setopt
-rotate = setuptools.command.rotate:rotate
-install_scripts = setuptools.command.install_scripts:install_scripts
-saveopts = setuptools.command.saveopts:saveopts
-alias = setuptools.command.alias:alias
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+test = setuptools.command.test:test
bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-install = setuptools.command.install:install
easy_install = setuptools.command.easy_install:easy_install
+setopt = setuptools.command.setopt:setopt
egg_info = setuptools.command.egg_info:egg_info
build_ext = setuptools.command.build_ext:build_ext
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+develop = setuptools.command.develop:develop
+saveopts = setuptools.command.saveopts:saveopts
+sdist = setuptools.command.sdist:sdist
+install_scripts = setuptools.command.install_scripts:install_scripts
+build_py = setuptools.command.build_py:build_py
+rotate = setuptools.command.rotate:rotate
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+upload_docs = setuptools.command.upload_docs:upload_docs
+alias = setuptools.command.alias:alias
+
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[distutils.setup_keywords]
+dependency_links = setuptools.dist:assert_string_list
+entry_points = setuptools.dist:check_entry_points
+namespace_packages = setuptools.dist:check_nsp
+packages = setuptools.dist:check_packages
+zip_safe = setuptools.dist:assert_bool
+extras_require = setuptools.dist:check_extras
+tests_require = setuptools.dist:check_requirements
+use_2to3_fixers = setuptools.dist:assert_string_list
+exclude_package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+test_suite = setuptools.dist:check_test_suite
+include_package_data = setuptools.dist:assert_bool
+convert_2to3_doctests = setuptools.dist:assert_string_list
+package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+use_2to3 = setuptools.dist:assert_bool
+eager_resources = setuptools.dist:assert_string_list
+test_loader = setuptools.dist:check_importable
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 0b577c97..6d385dc7 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,8 +1,5 @@
-[ssl:sys_platform=='win32' and python_version=='2.4']
-ctypes==1.0.2
-
[ssl:python_version in '2.4, 2.5']
ssl==1.16
@@ -10,4 +7,7 @@ ssl==1.16
certifi==0.0.8
[ssl:sys_platform=='win32']
-wincertstore==0.1 \ No newline at end of file
+wincertstore==0.1
+
+[ssl:sys_platform=='win32' and python_version=='2.4']
+ctypes==1.0.2 \ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 6f4fa58f..0f663085 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.3'
+__version__ = '1.4'