diff options
Diffstat (limited to 'pavement.py')
| -rw-r--r-- | pavement.py | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/pavement.py b/pavement.py index 850cc43b6..780993a38 100644 --- a/pavement.py +++ b/pavement.py @@ -65,11 +65,7 @@ import sys import shutil import subprocess import re -try: - from hashlib import md5 - from hashlib import sha256 -except ImportError: - from md5 import md5 +import hashlib import paver from paver.easy import \ @@ -99,10 +95,10 @@ finally: #----------------------------------- # Source of the release notes -RELEASE_NOTES = 'doc/release/1.13.0-notes.rst' +RELEASE_NOTES = 'doc/release/1.14.0-notes.rst' # Start/end of the log (from git) -LOG_START = 'maintenance/1.12.x' +LOG_START = 'maintenance/1.13.x' LOG_END = 'master' @@ -477,7 +473,7 @@ def _create_dmg(pyver, src_dir, volname=None): def dmg(options): try: pyver = options.dmg.python_version - except: + except Exception: pyver = DEFAULT_PYTHON idirs = options.installers.installersdir @@ -562,25 +558,22 @@ def sdist(options): target = os.path.join(idirs, tarball_name(t)) shutil.copy(source, target) -def compute_md5(idirs): +def _compute_hash(idirs, algo): released = paver.path.path(idirs).listdir() checksums = [] for f in sorted(released): - m = md5(open(f, 'r').read()) - checksums.append('%s %s' % (m.hexdigest(), os.path.basename(f))) - + with open(f, 'r') as _file: + m = algo(_file.read()) + checksums.append('%s %s' % (m.hexdigest(), os.path.basename(f))) return checksums +def compute_md5(idirs): + return _compute_hash(idirs, hashlib.md5) + def compute_sha256(idirs): # better checksum so gpg signed README.txt containing the sums can be used # to verify the binaries instead of signing all binaries - released = paver.path.path(idirs).listdir() - checksums = [] - for f in sorted(released): - m = sha256(open(f, 'r').read()) - checksums.append('%s %s' % (m.hexdigest(), os.path.basename(f))) - - return checksums + return _compute_hash(idirs, hashlib.sha256) def write_release_task(options, filename='README'): idirs = options.installers.installersdir |