Factored out the setuptools-specific code from release.py and moved the common functionality into jaraco.packaging. Use jaraco.packaging to enact releases.

1 files changed, 9 insertions, 205 deletions

diff --git a/release.py b/release.py
index 443d455d..e44ca0f1 100644
--- a/release.py
+++ b/release.py
@@ -1,225 +1,32 @@
-#!/usr/bin/env python
-
 """
-Script to fully automate the release process. Requires Python 2.6+
-with sphinx installed and the 'hg' command on the path.
+Setuptools is released using 'jaraco.packaging.release'. To make a release,
+install jaraco.packaging and run 'python -m jaraco.packaging.release'
 """
 
-from __future__ import print_function
-
-import subprocess
-import shutil
+import re
 import os
-import sys
-import getpass
-import collections
 import itertools
-import re
-
-import requests
-
-try:
-    input = raw_input
-except NameError:
-    pass
 
 try:
     zip_longest = itertools.zip_longest
 except AttributeError:
     zip_longest = itertools.izip_longest
 
-try:
-    import keyring
-except Exception:
-    pass
-
-VERSION = '0.10'
-PACKAGE_INDEX = 'https://pypi.python.org/pypi'
-
-def set_versions():
-    global VERSION
-    version = input("Release as version [%s]> " % VERSION) or VERSION
-    if version != VERSION:
-        VERSION = bump_versions(version)
-
-def infer_next_version(version):
-    """
-    Infer a next version from the current version by incrementing the last
-    number or appending a number.
+def before_upload():
+    _linkify('CHANGES.txt', 'CHANGES (linked).txt')
 
-    >>> infer_next_version('1.0')
-    '1.1'
-
-    >>> infer_next_version('1.0b')
-    '1.0b1'
-
-    >>> infer_next_version('1.0.10')
-    '1.0.10'
-
-    >>> infer_next_version('1')
-    '2'
-
-    >>> infer_next_version('')
-    '1'
-    """
-    def incr(match):
-        ver = int(match.group(0) or '0')
-        return str(ver + 1)
-    return re.sub('\d*$', incr, version)
+version = '0.10'
 
 files_with_versions = (
     'docs/conf.py', 'setup.py', 'release.py', 'ez_setup.py',
     'setuptools/__init__.py',
 )
 
-def get_repo_name():
-    """
-    Get the repo name from the hgrc default path.
-    """
-    default = subprocess.check_output('hg paths default').strip().decode('utf-8')
-    parts = default.split('/')
-    if parts[-1] == '':
-        parts.pop()
-    return '/'.join(parts[-2:])
-
-def get_mercurial_creds(system='https://bitbucket.org', username=None):
-    """
-    Return named tuple of username,password in much the same way that
-    Mercurial would (from the keyring).
-    """
-    # todo: consider getting this from .hgrc
-    username = username or getpass.getuser()
-    keyring_username = '@@'.join((username, system))
-    system = 'Mercurial'
-    password = (
-        keyring.get_password(system, keyring_username)
-        if 'keyring' in globals()
-        else None
-    )
-    if not password:
-        password = getpass.getpass()
-    Credential = collections.namedtuple('Credential', 'username password')
-    return Credential(username, password)
+test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"
 
-def add_milestone_and_version(version):
-    base = 'https://api.bitbucket.org'
-    for type in 'milestones', 'versions':
-        url = (base + '/1.0/repositories/{repo}/issues/{type}'
-            .format(repo = get_repo_name(), type=type))
-        resp = requests.post(url=url,
-            data='name='+version, auth=get_mercurial_creds())
-        resp.raise_for_status()
+os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
 
-def bump_versions(target_ver):
-    for filename in files_with_versions:
-        bump_version(filename, target_ver)
-    subprocess.check_call(['hg', 'ci', '-m',
-        'Bumped to {target_ver} in preparation for next '
-        'release.'.format(**vars())])
-    return target_ver
-
-def bump_version(filename, target_ver):
-    with open(filename, 'rb') as f:
-        lines = [
-            line.replace(VERSION.encode('ascii'), target_ver.encode('ascii'))
-            for line in f
-        ]
-    with open(filename, 'wb') as f:
-        f.writelines(lines)
-
-def do_release():
-    assert all(map(os.path.exists, files_with_versions)), (
-        "Expected file(s) missing")
-
-    assert has_sphinx(), "You must have Sphinx installed to release"
-
-    set_versions()
-
-    res = input('Have you read through the SCM changelog and '
-        'confirmed the changelog is current for releasing {VERSION}? '
-        .format(**globals()))
-    if not res.lower().startswith('y'):
-        print("Please do that")
-        raise SystemExit(1)
-
-    print("Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools")
-    res = input('Have you or has someone verified that the tests '
-        'pass on this revision? ')
-    if not res.lower().startswith('y'):
-        print("Please do that")
-        raise SystemExit(2)
-
-    subprocess.check_call(['hg', 'tag', VERSION])
-
-    subprocess.check_call(['hg', 'update', VERSION])
-
-    upload_to_pypi()
-    upload_ez_setup()
-
-    # update to the tip for the next operation
-    subprocess.check_call(['hg', 'update'])
-
-    # we just tagged the current version, bump for the next release.
-    next_ver = bump_versions(infer_next_version(VERSION))
-
-    # push the changes
-    subprocess.check_call(['hg', 'push'])
-
-    add_milestone_and_version(next_ver)
-
-def upload_to_pypi():
-    linkify('CHANGES.txt', 'CHANGES (links).txt')
-
-    has_docs = build_docs()
-    if os.path.isdir('./dist'):
-        shutil.rmtree('./dist')
-    cmd = [
-        sys.executable, 'setup.py', '-q',
-        'egg_info', '-RD', '-b', '',
-        'sdist',
-        'register', '-r', PACKAGE_INDEX,
-        'upload', '-r', PACKAGE_INDEX,
-    ]
-    if has_docs:
-        cmd.extend([
-            'upload_docs', '-r', PACKAGE_INDEX
-        ])
-    env = os.environ.copy()
-    env["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"
-    subprocess.check_call(cmd, env=env)
-
-def upload_ez_setup():
-    """
-    TODO: upload ez_setup.py to a permalinked location. Currently, this
-    location is https://bitbucket.org/pypa/setuptools/downloads/ez_setup.py .
-    In the long term, it should be on PyPI.
-    """
-
-def has_sphinx():
-    try:
-        devnull = open(os.path.devnull, 'wb')
-        subprocess.Popen(['sphinx-build', '--version'], stdout=devnull,
-            stderr=subprocess.STDOUT).wait()
-    except Exception:
-        return False
-    return True
-
-def build_docs():
-    if not os.path.isdir('docs'):
-        return
-    if os.path.isdir('docs/build'):
-        shutil.rmtree('docs/build')
-    cmd = [
-        'sphinx-build',
-        '-b', 'html',
-        '-d', 'build/doctrees',
-        '.',
-        'build/html',
-    ]
-    subprocess.check_call(cmd, cwd='docs')
-    return True
-
-def linkify(source, dest):
+def _linkify(source, dest):
     with open(source) as source:
         out = _linkified_text(source.read())
     with open(dest, 'w') as dest:
@@ -272,6 +79,3 @@ def _linkified_part(text, anchors):
 
     anchors.extend(revision.findall(text)) # ['Issue #43', ...]
     return revision.sub(r'`\1`_', text)
-
-if __name__ == '__main__':
-    do_release()