diff options
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | docs/using.txt | 2 | ||||
| -rw-r--r-- | ez_setup.py | 2 | ||||
| -rw-r--r-- | release.py | 35 | ||||
| -rw-r--r-- | setuptools.egg-info/entry_points.txt | 124 | ||||
| -rw-r--r-- | setuptools.egg-info/requires.txt | 8 | ||||
| -rw-r--r-- | setuptools/version.py | 2 |
8 files changed, 100 insertions, 81 deletions
@@ -92,3 +92,4 @@ e0a6e225ad6b28471cd42cfede6e8a334bb548fb 0.9.8 7b91ff93a30ef78634b7bb34f4a6229a5de281ee 1.0b1 aba16323ec9382da7bc77c633990ccb3bd58d050 1.0b2 8a98492f0d852402c93ddbbf3f07081909a9105f 1.0b3 +c385fdf1f976fb1d2a6accc9292d8eca419180fa 1.0 diff --git a/CHANGES.txt b/CHANGES.txt index a075c3c8..9f1d15b3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -24,7 +24,7 @@ CHANGES connection. Backward-Incompatible Changes -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +============================= This release includes a couple of backward-incompatible changes, but most if not all users will find 1.0 a drop-in replacement for 0.9. @@ -1162,8 +1162,9 @@ easy_install * ``setuptools`` now finds its commands, ``setup()`` argument validators, and metadata writers using entry points, so that they can be extended by - third-party packages. See `Creating distutils Extensions`_ above for more - details. + third-party packages. See `Creating distutils Extensions + <http://pythonhosted.org/setuptools/setuptools.html#creating-distutils-extensions>`_ + for more details. * The vestigial ``depends`` command has been removed. It was never finished or documented, and never would have worked without EasyInstall - which it diff --git a/docs/using.txt b/docs/using.txt index 6f93c386..e44847d6 100644 --- a/docs/using.txt +++ b/docs/using.txt @@ -4,7 +4,7 @@ Using Setuptools in your project To use Setuptools in your project, the recommended way is to ship `ez_setup.py` alongside your `setup.py` script and call -it at the very begining of `setup.py` like this:: +it at the very beginning of `setup.py` like this:: from ez_setup import use_setuptools use_setuptools() diff --git a/ez_setup.py b/ez_setup.py index 837ef3f3..40db5a57 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -29,7 +29,7 @@ try: except ImportError: USER_SITE = None -DEFAULT_VERSION = "1.0" +DEFAULT_VERSION = "1.1" DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/" def _python_cmd(*args): @@ -9,11 +9,17 @@ import subprocess import pkg_resources -pkg_resources.require('jaraco.packaging>=1.1') +pkg_resources.require('jaraco.packaging>=2.0') + def before_upload(): _linkify('CHANGES.txt', 'CHANGES (links).txt') - _add_bootstrap_bookmark() + BootstrapBookmark.add() + + +def after_push(): + os.remove('CHANGES (links).txt') + BootstrapBookmark.push() files_with_versions = ( 'ez_setup.py', 'setuptools/version.py', @@ -23,9 +29,6 @@ test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools" os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1" -# override the push command to include the bootstrap bookmark. -push_command = ['hg', 'push', '-B', 'bootstrap'] - link_patterns = [ r"(Issue )?#(?P<issue>\d+)", r"Distribute #(?P<distribute>\d+)", @@ -61,7 +64,21 @@ def replacer(match): url = issue_urls[key].format(**match_dict) return "`{text} <{url}>`_".format(text=text, url=url) - -def _add_bootstrap_bookmark(): - cmd = ['hg', 'bookmark', '-i', 'bootstrap', '-f'] - subprocess.Popen(cmd) +class BootstrapBookmark: + name = 'bootstrap' + + @classmethod + def add(cls): + cmd = ['hg', 'bookmark', '-i', cls.name, '-f'] + subprocess.Popen(cmd) + + @classmethod + def push(cls): + """ + Push the bootstrap bookmark + """ + push_command = ['hg', 'push', '-B', cls.name] + # don't use check_call here because mercurial will return a non-zero + # code even if it succeeds at pushing the bookmark (because there are + # no changesets to be pushed). !dm mercurial + subprocess.call(push_command) diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt index ba887a08..df9b9c2d 100644 --- a/setuptools.egg-info/entry_points.txt +++ b/setuptools.egg-info/entry_points.txt @@ -1,62 +1,62 @@ -[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
-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
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-entry_points.txt = setuptools.command.egg_info:write_entries
-
-[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]
-dependency_links = setuptools.dist:assert_string_list
-packages = setuptools.dist:check_packages
-exclude_package_data = setuptools.dist:check_package_data
-use_2to3_exclude_fixers = setuptools.dist:assert_string_list
-package_data = setuptools.dist:check_package_data
-use_2to3 = setuptools.dist:assert_bool
-tests_require = setuptools.dist:check_requirements
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-include_package_data = setuptools.dist:assert_bool
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-install_requires = setuptools.dist:check_requirements
-use_2to3_fixers = setuptools.dist:assert_string_list
-test_suite = setuptools.dist:check_test_suite
-test_loader = setuptools.dist:check_importable
-namespace_packages = setuptools.dist:check_nsp
-convert_2to3_doctests = setuptools.dist:assert_string_list
-
-[distutils.commands]
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-egg_info = setuptools.command.egg_info:egg_info
-alias = setuptools.command.alias:alias
-sdist = setuptools.command.sdist:sdist
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-test = setuptools.command.test:test
-easy_install = setuptools.command.easy_install:easy_install
-register = setuptools.command.register:register
-setopt = setuptools.command.setopt:setopt
-install = setuptools.command.install:install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-build_ext = setuptools.command.build_ext:build_ext
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-install_lib = setuptools.command.install_lib:install_lib
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-
+[distutils.commands] +install_scripts = setuptools.command.install_scripts:install_scripts +install = setuptools.command.install:install +setopt = setuptools.command.setopt:setopt +register = setuptools.command.register:register +easy_install = setuptools.command.easy_install:easy_install +test = setuptools.command.test:test +sdist = setuptools.command.sdist:sdist +alias = setuptools.command.alias:alias +bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst +egg_info = setuptools.command.egg_info:egg_info +bdist_egg = setuptools.command.bdist_egg:bdist_egg +build_py = setuptools.command.build_py:build_py +upload_docs = setuptools.command.upload_docs:upload_docs +install_lib = setuptools.command.install_lib:install_lib +develop = setuptools.command.develop:develop +rotate = setuptools.command.rotate:rotate +build_ext = setuptools.command.build_ext:build_ext +bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm +saveopts = setuptools.command.saveopts:saveopts +install_egg_info = setuptools.command.install_egg_info:install_egg_info + +[distutils.setup_keywords] +tests_require = setuptools.dist:check_requirements +install_requires = setuptools.dist:check_requirements +package_data = setuptools.dist:check_package_data +use_2to3_exclude_fixers = setuptools.dist:assert_string_list +exclude_package_data = setuptools.dist:check_package_data +dependency_links = setuptools.dist:assert_string_list +convert_2to3_doctests = setuptools.dist:assert_string_list +use_2to3_fixers = setuptools.dist:assert_string_list +test_loader = setuptools.dist:check_importable +use_2to3 = setuptools.dist:assert_bool +test_suite = setuptools.dist:check_test_suite +namespace_packages = setuptools.dist:check_nsp +zip_safe = setuptools.dist:assert_bool +packages = setuptools.dist:check_packages +eager_resources = setuptools.dist:assert_string_list +include_package_data = setuptools.dist:assert_bool +extras_require = setuptools.dist:check_extras +entry_points = setuptools.dist:check_entry_points + +[console_scripts] +easy_install-3.3 = setuptools.command.easy_install:main +easy_install = setuptools.command.easy_install:main + +[setuptools.installation] +eggsecutable = setuptools.command.easy_install:bootstrap + +[egg_info.writers] +entry_points.txt = setuptools.command.egg_info:write_entries +PKG-INFO = setuptools.command.egg_info:write_pkg_info +requires.txt = setuptools.command.egg_info:write_requirements +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 +top_level.txt = setuptools.command.egg_info:write_toplevel_names +depends.txt = setuptools.command.egg_info:warn_depends_obsolete + +[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 5de4d6e7..c06a8a0b 100644 --- a/setuptools.egg-info/requires.txt +++ b/setuptools.egg-info/requires.txt @@ -1,8 +1,5 @@ -[certs] -certifi==0.0.8 - [ssl:sys_platform=='win32'] wincertstore==0.1 @@ -10,4 +7,7 @@ wincertstore==0.1 ctypes==1.0.2 [ssl:python_version in '2.4, 2.5'] -ssl==1.16
\ No newline at end of file +ssl==1.16 + +[certs] +certifi==0.0.8
\ No newline at end of file diff --git a/setuptools/version.py b/setuptools/version.py index 7e49527e..439eb0cd 100644 --- a/setuptools/version.py +++ b/setuptools/version.py @@ -1 +1 @@ -__version__ = '1.0' +__version__ = '1.1' |