aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 e4a357eb..324c0774 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -31,7 +31,7 @@ try:
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "3.0"
+DEFAULT_VERSION = "3.1"
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 5e417433..78e8c092 100644
--- a/setuptools.egg-info/entry_points.txt
+++ b/setuptools.egg-info/entry_points.txt
@@ -1,61 +1,61 @@
-[egg_info.writers]
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-requires.txt = setuptools.command.egg_info:write_requirements
-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
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+[distutils.setup_keywords]
+eager_resources = setuptools.dist:assert_string_list
+use_2to3 = setuptools.dist:assert_bool
+use_2to3_fixers = setuptools.dist:assert_string_list
+tests_require = setuptools.dist:check_requirements
+extras_require = setuptools.dist:check_extras
+zip_safe = setuptools.dist:assert_bool
+exclude_package_data = setuptools.dist:check_package_data
+install_requires = setuptools.dist:check_requirements
+test_loader = setuptools.dist:check_importable
+include_package_data = setuptools.dist:assert_bool
+test_suite = setuptools.dist:check_test_suite
+entry_points = setuptools.dist:check_entry_points
+package_data = setuptools.dist:check_package_data
+packages = setuptools.dist:check_packages
+convert_2to3_doctests = setuptools.dist:assert_string_list
+namespace_packages = setuptools.dist:check_nsp
+use_2to3_exclude_fixers = setuptools.dist:assert_string_list
+dependency_links = setuptools.dist:assert_string_list
[distutils.commands]
-install = setuptools.command.install:install
develop = setuptools.command.develop:develop
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-build_ext = setuptools.command.build_ext:build_ext
-install_scripts = setuptools.command.install_scripts:install_scripts
+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+bdist_egg = setuptools.command.bdist_egg:bdist_egg
+register = setuptools.command.register:register
+build_py = setuptools.command.build_py:build_py
rotate = setuptools.command.rotate:rotate
-saveopts = setuptools.command.saveopts:saveopts
+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
alias = setuptools.command.alias:alias
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-easy_install = setuptools.command.easy_install:easy_install
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
+build_ext = setuptools.command.build_ext:build_ext
+install = setuptools.command.install:install
install_lib = setuptools.command.install_lib:install_lib
-egg_info = setuptools.command.egg_info:egg_info
-sdist = setuptools.command.sdist:sdist
-build_py = setuptools.command.build_py:build_py
-upload_docs = setuptools.command.upload_docs:upload_docs
-register = setuptools.command.register:register
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
+install_egg_info = setuptools.command.install_egg_info:install_egg_info
test = setuptools.command.test:test
+upload_docs = setuptools.command.upload_docs:upload_docs
+sdist = setuptools.command.sdist:sdist
+egg_info = setuptools.command.egg_info:egg_info
+easy_install = setuptools.command.easy_install:easy_install
+saveopts = setuptools.command.saveopts:saveopts
setopt = setuptools.command.setopt:setopt
+install_scripts = setuptools.command.install_scripts:install_scripts
-[distutils.setup_keywords]
-namespace_packages = setuptools.dist:check_nsp
-zip_safe = setuptools.dist:assert_bool
-use_2to3 = setuptools.dist:assert_bool
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-dependency_links = setuptools.dist:assert_string_list
-test_loader = setuptools.dist:check_importable
-extras_require = setuptools.dist:check_extras
-convert_2to3_doctests = setuptools.dist:assert_string_list
-install_requires = setuptools.dist:check_requirements
-tests_require = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-package_data = setuptools.dist:check_package_data
-include_package_data = setuptools.dist:assert_bool
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-exclude_package_data = setuptools.dist:check_package_data
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
+[egg_info.writers]
+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
+dependency_links.txt = setuptools.command.egg_info:overwrite_arg
+eager_resources.txt = setuptools.command.egg_info:overwrite_arg
+PKG-INFO = setuptools.command.egg_info:write_pkg_info
+depends.txt = setuptools.command.egg_info:warn_depends_obsolete
[setuptools.file_finders]
svn_cvs = setuptools.command.sdist:_default_revctrl
+[setuptools.installation]
+eggsecutable = setuptools.command.easy_install:bootstrap
+
[console_scripts]
easy_install = setuptools.command.easy_install:main
easy_install-3.4 = setuptools.command.easy_install:main
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt
index 4fd464d8..9a6bf437 100644
--- a/setuptools.egg-info/requires.txt
+++ b/setuptools.egg-info/requires.txt
@@ -1,7 +1,7 @@
-[ssl:sys_platform=='win32']
-wincertstore==0.1
-
[certs]
-certifi==0.0.8 \ No newline at end of file
+certifi==0.0.8
+
+[ssl:sys_platform=='win32']
+wincertstore==0.1 \ No newline at end of file
diff --git a/setuptools/version.py b/setuptools/version.py
index f7d2e869..27d4bb66 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '3.0'
+__version__ = '3.1'