aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-09-06 09:40:24 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-09-06 09:40:24 -0400
commit6e15af98b61f4e12c25719ee2535fac722616c68 (patch)
tree76b2ad59437107677713f65ab098436ed0c2bfa4
parentad24b4aa2be03dd3dcd509c13171aefafb5e3008 (diff)
downloadexternal_python_setuptools-6e15af98b61f4e12c25719ee2535fac722616c68.tar.gz
external_python_setuptools-6e15af98b61f4e12c25719ee2535fac722616c68.tar.bz2
external_python_setuptools-6e15af98b61f4e12c25719ee2535fac722616c68.zip
Bumped to 1.1.4 in preparation for next release.
-rw-r--r--ez_setup.py2
-rw-r--r--setuptools.egg-info/entry_points.txt96
-rw-r--r--setuptools.egg-info/requires.txt8
-rw-r--r--setuptools/version.py2
4 files changed, 54 insertions, 54 deletions
diff --git a/ez_setup.py b/ez_setup.py
index 01fcb9d2..79713bd8 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -29,7 +29,7 @@ try:
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "1.1.3"
+DEFAULT_VERSION = "1.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 6edb7741..d6b54060 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
-dependency_links = setuptools.dist:assert_string_list
-use_2to3 = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-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
-test_loader = setuptools.dist:check_importable
-convert_2to3_doctests = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-package_data = setuptools.dist:check_package_data
-packages = setuptools.dist:check_packages
-exclude_package_data = setuptools.dist:check_package_data
-use_2to3_fixers = setuptools.dist:assert_string_list
-
-[egg_info.writers]
-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
-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
-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-3.3 = setuptools.command.easy_install:main
+easy_install = setuptools.command.easy_install:main
[distutils.commands]
-sdist = setuptools.command.sdist:sdist
-rotate = setuptools.command.rotate:rotate
-test = setuptools.command.test:test
-alias = setuptools.command.alias:alias
-build_py = setuptools.command.build_py:build_py
-build_ext = setuptools.command.build_ext:build_ext
-install_lib = setuptools.command.install_lib:install_lib
-saveopts = setuptools.command.saveopts:saveopts
-easy_install = setuptools.command.easy_install:easy_install
register = setuptools.command.register:register
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-install = setuptools.command.install:install
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+install_lib = setuptools.command.install_lib:install_lib
+build_ext = setuptools.command.build_ext:build_ext
develop = setuptools.command.develop:develop
install_scripts = setuptools.command.install_scripts:install_scripts
-egg_info = setuptools.command.egg_info:egg_info
+build_py = setuptools.command.build_py:build_py
install_egg_info = setuptools.command.install_egg_info:install_egg_info
+egg_info = setuptools.command.egg_info:egg_info
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+alias = setuptools.command.alias:alias
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+easy_install = setuptools.command.easy_install:easy_install
+test = setuptools.command.test:test
+install = setuptools.command.install:install
setopt = setuptools.command.setopt:setopt
upload_docs = setuptools.command.upload_docs:upload_docs
bdist_egg = setuptools.command.bdist_egg:bdist_egg
+rotate = setuptools.command.rotate:rotate
+sdist = setuptools.command.sdist:sdist
+saveopts = setuptools.command.saveopts:saveopts
+
+[distutils.setup_keywords]
+test_suite = setuptools.dist:check_test_suite
+packages = setuptools.dist:check_packages
+use_2to3_fixers = setuptools.dist:assert_string_list
+convert_2to3_doctests = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+test_loader = setuptools.dist:check_importable
+extras_require = setuptools.dist:check_extras
+zip_safe = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+eager_resources = setuptools.dist:assert_string_list
+include_package_data = setuptools.dist:assert_bool
+package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+use_2to3 = setuptools.dist:assert_bool
+entry_points = setuptools.dist:check_entry_points
+dependency_links = setuptools.dist:assert_string_list
+install_requires = setuptools.dist:check_requirements
[setuptools.file_finders]
svn_cvs = setuptools.command.sdist:_default_revctrl
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-3.3 = setuptools.command.easy_install:main
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
+[egg_info.writers]
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+requires.txt = setuptools.command.egg_info:write_requirements
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+entry_points.txt = setuptools.command.egg_info:write_entries
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index e4fb4954..0b577c97 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -3,11 +3,11 @@
[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:python_version in '2.4, 2.5']
-ssl==1.16 \ No newline at end of file
+[ssl:sys_platform=='win32']
+wincertstore==0.1 \ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 7bb021e2..bc50bee6 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '1.1.3'
+__version__ = '1.1.4'