[Packaging] Update make_release script for Py3

xz compression is included in Python 3 so simplify script.
This commit is contained in:
Calum Lind 2018-10-17 12:58:07 +01:00
commit 860730d43c

View file

@ -10,44 +10,46 @@
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
import os.path import os.path
import sys
from hashlib import sha256 from hashlib import sha256
from subprocess import call, check_output from subprocess import call, check_output
try: PY2 = sys.version_info.major == 2
import lzma
except ImportError:
try:
from backports import lzma
except ImportError:
print('backports.lzma not installed, falling back to xz shell command')
lzma = None
# Compress WebUI javascript and gettext.js sdist_formats = 'xztar'
call(['python', 'minify_web_js.py']) if PY2:
call(['python', 'gen_web_gettext.py']) sdist_formats = 'tar'
version = check_output(['python', 'version.py']).strip() version = check_output(['python', 'version.py']).strip().decode()
# Create release archive # Create release archive
release_dir = 'dist/release-%s' % version release_dir = 'dist/release-%s' % version
print('Creating release archive for ' + version) print('Creating release archive for ' + version)
call( call(
'python setup.py --quiet egg_info --egg-base /tmp sdist --formats=tar --dist-dir=%s' 'python setup.py --quiet egg_info --egg-base /tmp sdist --formats=%s --dist-dir=%s'
% release_dir, % (sdist_formats, release_dir),
shell=True, shell=True,
) )
# Compress release archive with xz
tar_path = os.path.join(release_dir, 'deluge-%s.tar' % version) if sdist_formats == 'xztar':
tarxz_path = tar_path + '.xz' tarxz_path = os.path.join(release_dir, 'deluge-%s.tar.xz' % version)
print('Compressing tar (%s) with xz' % tar_path) else:
if lzma: # Compress release archive with xz
tar_path = os.path.join(release_dir, 'deluge-%s.tar' % version)
tarxz_path = tar_path + '.xz'
print('Compressing tar (%s) with xz' % tar_path)
try:
from backports import lzma
except ImportError:
print('backports.lzma not installed, falling back to xz shell command')
call(['xz', '-e9zkf', tar_path])
else:
with open(tar_path, 'rb') as tar_file, open(tarxz_path, 'wb') as xz_file: with open(tar_path, 'rb') as tar_file, open(tarxz_path, 'wb') as xz_file:
xz_file.write( xz_file.write(
lzma.compress(bytes(tar_file.read()), preset=9 | lzma.PRESET_EXTREME) lzma.compress(bytes(tar_file.read()), preset=9 | lzma.PRESET_EXTREME)
) )
else:
call(['xz', '-e9zkf', tar_path])
# Calculate shasum and add to sha256sums.txt # Calculate shasum and add to sha256sums.txt
with open(tarxz_path, 'rb') as _file: with open(tarxz_path, 'rb') as _file: