Use jaraco.packaging 2.0 to invoke pushing the bookmark as a separate operation from pushing the other changesets.

1 files changed, 10 insertions, 2 deletions

diff --git a/release.py b/release.py
index c2b331c7..221d8a67 100644
--- a/release.py
+++ b/release.py
@@ -9,7 +9,7 @@ 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')
@@ -24,7 +24,15 @@ 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']
+def after_push():
+    """
+    Push the bootstrap bookmark
+    """
+    push_command = ['hg', 'push', '-B', 'bootstrap']
+    # 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)
 
 link_patterns = [
     r"(Issue )?#(?P<issue>\d+)",