summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-03-16 05:05:02 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-03-16 05:05:02 -0400
commitc74177b8d8c565650abec45d2f90550be0c2702f (patch)
tree908711cd93b6bb42df925b163b0f09bc455e4fe9
parentf23f741c4a0d866f8a38e641065ced7feb106de2 (diff)
downloadpython-setuptools-git-c74177b8d8c565650abec45d2f90550be0c2702f.tar.gz
Bumped to 3.4 in preparation for next release.
-rw-r--r--ez_setup.py2
-rw-r--r--setuptools.egg-info/entry_points.txt82
-rw-r--r--setuptools.egg-info/requires.txt8
-rw-r--r--setuptools/version.py2
4 files changed, 47 insertions, 47 deletions
diff --git a/ez_setup.py b/ez_setup.py
index 6a6adf7c..9811d7d8 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@ try:
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "3.3"
+DEFAULT_VERSION = "3.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 3eba6cc3..0253d11a 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,60 +1,60 @@
-[distutils.commands]
-alias = setuptools.command.alias:alias
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-upload_docs = setuptools.command.upload_docs:upload_docs
-build_py = setuptools.command.build_py:build_py
-test = setuptools.command.test:test
-register = setuptools.command.register:register
-egg_info = setuptools.command.egg_info:egg_info
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-rotate = setuptools.command.rotate:rotate
-sdist = setuptools.command.sdist:sdist
-install_scripts = setuptools.command.install_scripts:install_scripts
-build_ext = setuptools.command.build_ext:build_ext
-saveopts = setuptools.command.saveopts:saveopts
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-develop = setuptools.command.develop:develop
-easy_install = setuptools.command.easy_install:easy_install
-setopt = setuptools.command.setopt:setopt
-install_lib = setuptools.command.install_lib:install_lib
-install = setuptools.command.install:install
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
[setuptools.installation]
eggsecutable = setuptools.command.easy_install:bootstrap
[distutils.setup_keywords]
-exclude_package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
+packages = setuptools.dist:check_packages
+entry_points = setuptools.dist:check_entry_points
test_suite = setuptools.dist:check_test_suite
-zip_safe = setuptools.dist:assert_bool
+include_package_data = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+convert_2to3_doctests = setuptools.dist:assert_string_list
extras_require = setuptools.dist:check_extras
+install_requires = setuptools.dist:check_requirements
use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
+zip_safe = setuptools.dist:assert_bool
+namespace_packages = setuptools.dist:check_nsp
+test_loader = setuptools.dist:check_importable
use_2to3 = setuptools.dist:assert_bool
-dependency_links = setuptools.dist:assert_string_list
-convert_2to3_doctests = setuptools.dist:assert_string_list
eager_resources = setuptools.dist:assert_string_list
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
tests_require = setuptools.dist:check_requirements
-packages = setuptools.dist:check_packages
-namespace_packages = setuptools.dist:check_nsp
-test_loader = setuptools.dist:check_importable
-entry_points = setuptools.dist:check_entry_points
package_data = setuptools.dist:check_package_data
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+
+[setuptools.file_finders]
+svn_cvs = setuptools.command.sdist:_default_revctrl
+
+[distutils.commands]
+setopt = setuptools.command.setopt:setopt
+easy_install = setuptools.command.easy_install:easy_install
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+register = setuptools.command.register:register
+test = setuptools.command.test:test
+install_scripts = setuptools.command.install_scripts:install_scripts
+install = setuptools.command.install:install
+alias = setuptools.command.alias:alias
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+build_py = setuptools.command.build_py:build_py
+install_lib = setuptools.command.install_lib:install_lib
+rotate = setuptools.command.rotate:rotate
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+egg_info = setuptools.command.egg_info:egg_info
+develop = setuptools.command.develop:develop
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_ext = setuptools.command.build_ext:build_ext
+sdist = setuptools.command.sdist:sdist
+saveopts = setuptools.command.saveopts:saveopts
+upload_docs = setuptools.command.upload_docs:upload_docs
[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
namespace_packages.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
-requires.txt = setuptools.command.egg_info:write_requirements
eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+entry_points.txt = setuptools.command.egg_info:write_entries
PKG-INFO = setuptools.command.egg_info:write_pkg_info
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+top_level.txt = setuptools.command.egg_info:write_toplevel_names
+requires.txt = setuptools.command.egg_info:write_requirements
[console_scripts]
easy_install = setuptools.command.easy_install:main
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index a49a923e..e5db30ad 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
-[certs]
-certifi==1.0.1
-
[ssl:sys_platform=='win32']
-wincertstore==0.2 \ No newline at end of file
+wincertstore==0.2
+
+[certs]
+certifi==1.0.1 \ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index 83935d5d..36f77735 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.3'
+__version__ = '3.4'