1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337
|
#############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Qt for Python project.
##
## $QT_BEGIN_LICENSE:LGPL$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 3 as published by the Free Software
## Foundation and appearing in the file LICENSE.LGPL3 included in the
## packaging of this file. Please review the following information to
## ensure the GNU Lesser General Public License version 3 requirements
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 2.0 or (at your option) the GNU General
## Public license version 3 or any later version approved by the KDE Free
## Qt Foundation. The licenses are as published by the Free Software
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
## https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
#############################################################################
import re
import os
import sys
from argparse import ArgumentParser, Namespace, RawTextHelpFormatter
from subprocess import check_output, Popen, PIPE
from pathlib import Path
from typing import Dict, List, Tuple
content_header = """Qt for Python @VERSION is a @TYPE release.
For more details, refer to the online documentation included in this
distribution. The documentation is also available online:
https://doc.qt.io/qtforpython/
Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Qt Bug Tracker:
https://bugreports.qt.io/
Each of these identifiers can be entered in the bug tracker to obtain more
information about a particular change.
****************************************************************************
* PySide2 *
****************************************************************************
"""
shiboken_header = """****************************************************************************
* Shiboken2 *
****************************************************************************
"""
def change_log(version: list) -> Path:
"""Return path of the changelog of the version."""
name = f"changes-{version[0]}.{version[1]}.{version[2]}"
return Path(__file__).parents[1] / "dist" / name
def is_lts_version(version: list) -> bool:
return version[0] == 5 or version[1] == 2
def version_tag(version: list) -> str:
"""Return the version tag."""
tag = f"v{version[0]}.{version[1]}.{version[2]}"
return tag + "-lts" if is_lts_version(version) else tag
def revision_range(version: list) -> str:
"""Determine a git revision_range from the version. Either log from
the previous version tag or since the last update to the changelog."""
changelog = change_log(version)
if changelog.is_file():
output = check_output(["git", "log", "-n", "1", "--format=%H",
os.fspath(changelog)])
if output:
return output.strip().decode("utf-8") + "..HEAD"
last_version = version.copy()
if version[2] == 0:
adjust_idx = 0 if version[1] == 0 else 1
else:
adjust_idx = 2
last_version[adjust_idx] -= 1
return version_tag(last_version) + "..HEAD"
def parse_options() -> Namespace:
tag_msg = ("Tags, branches, or SHA to compare\n"
"e.g.: v5.12.1..5.12\n"
" v5.12.0..v5.12.1\n"
" cebc32a5..5.12")
options = ArgumentParser(description="PySide2 changelog tool",
formatter_class=RawTextHelpFormatter)
options.add_argument("-d",
"--directory",
type=str,
help="Repository directory, '.' is default.")
options.add_argument("-v",
"--versions",
type=str,
help=tag_msg)
options.add_argument("-r",
"--release",
type=str,
help="Release version: e.g.: 5.12.4",
required=True)
options.add_argument("-t",
"--type",
type=str,
help="Release type: bug-fix, minor, or major")
args = options.parse_args()
release_version = list(int(v) for v in args.release.split("."))
if len(release_version) != 3:
print("Error: --release must be of form major.minor.patch")
sys.exit(-1)
# Some auto-detection smartness
if not args.type:
if release_version[2] == 0:
args.type = "major" if release_version[1] == 0 else "minor"
else:
args.type = "bug-fix"
# For major/minor releases, skip all fixes with "Pick-to: " since they
# appear in bug-fix releases.
if args.type != "bug-fix":
args.exclude = True
print(f'Assuming "{args.type}" version', file=sys.stderr)
if args.type not in ("bug-fix", "minor", "major"):
print("Error: "
"-y/--type needs to be: bug-fix (default), minor, or major")
sys.exit(-1)
if not args.versions:
args.versions = revision_range(release_version)
print(f"Assuming range {args.versions}", file=sys.stderr)
args.release_version = release_version
return args
def check_tag(tag: str) -> bool:
output = False
if tag[0] == "v":
# Git tag
command = "git tag -l {}".format(tag)
print("{}: {}".format(check_tag.__name__, command), file=sys.stderr)
if check_output(command.split()):
output = True
elif re.match(r"^\d\.\d?", tag):
# Git branch (origin)
command = "git show-ref {}".format(tag)
print("{}: {}".format(check_tag.__name__, command), file=sys.stderr)
if check_output(command.split()):
output = True
else:
# Git sha
command = "git cat-file -t {}".format(tag)
print("{}: {}".format(check_tag.__name__, command), file=sys.stderr)
if check_output(command.split()):
output = True
return output
def get_commit_content(sha: str) -> str:
command = "git log {} -n 1 --pretty=format:%s%n%n%b".format(sha)
print("{}: {}".format(get_commit_content.__name__, command),
file=sys.stderr)
out, err = Popen(command, stdout=PIPE, shell=True).communicate()
if err:
print(err, file=sys.stderr)
return out.decode("utf-8")
def git_get_sha1s(versions: List[str], pattern: str):
"""Return a list of SHA1s matching a pattern"""
command = "git rev-list --reverse --grep '^{}'".format(pattern)
command += " {}..{}".format(versions[0], versions[1])
command += " | git cat-file --batch"
command += " | grep -o -E \"^[0-9a-f]{40} commit\""
command += " | awk '{print $1}'"
print("{}: {}".format(git_command.__name__, command), file=sys.stderr)
out_sha1, err = Popen(command, stdout=PIPE, shell=True).communicate()
if err:
print(err, file=sys.stderr)
return [s.decode("utf-8") for s in out_sha1.splitlines()]
def git_command(versions: List[str], pattern: str):
task_number_re = re.compile(r'^.*-(\d+)\s*$')
for sha in git_get_sha1s(versions, pattern):
content = get_commit_content(sha).splitlines()
# First line is title
title = content[0]
# Look for PYSIDE-XXXX
task = None
for line in content[::-1]:
if line.startswith(pattern):
task = line.replace("{}:".format(pattern), "").strip()
break
if not task:
continue
task_number = -1
task_number_match = task_number_re.match(task)
if task_number_match:
task_number = int(task_number_match.group(1))
entry = {"title": title, "task": task, "task-number": task_number}
if "shiboken" in title:
if sha not in shiboken2_commits:
shiboken2_commits[sha] = entry
else:
if sha not in pyside2_commits:
pyside2_commits[sha] = entry
def create_fixes_log(versions: List[str]) -> None:
git_command(versions, "Fixes: ")
def create_task_log(versions: List[str]) -> None:
git_command(versions, "Task-number: ")
def extract_change_log(commit_message: List[str]) -> Tuple[str, List[str]]:
"""Extract a tuple of (component, change log lines) from a commit message
of the form [ChangeLog][shiboken2] description..."""
result = []
component = 'pyside'
within_changelog = False
task_nr = ''
for line in commit_message:
if within_changelog:
if line:
result.append(' ' + line.strip())
else:
within_changelog = False
else:
if line.startswith('[ChangeLog]'):
log_line = line[11:]
if log_line.startswith('['):
end = log_line.find(']')
if end > 0:
component = log_line[1:end]
log_line = log_line[end + 1:]
result.append(log_line.strip())
within_changelog = True
elif line.startswith("Fixes: ") or line.startswith("Task-number: "):
task_nr = line.split(":")[1].strip()
if result:
first_line = ' - '
if task_nr:
first_line += "[{}] ".format(task_nr)
first_line += result[0]
result[0] = first_line
return (component, result)
def create_change_log(versions: List[str]) -> None:
for sha in git_get_sha1s(versions, r"\[ChangeLog\]"):
change_log = extract_change_log(get_commit_content(sha).splitlines())
if change_log[0].startswith('shiboken'):
shiboken2_changelogs.extend(change_log[1])
else:
pyside2_changelogs.extend(change_log[1])
def gen_list(d: Dict[str, Dict[str, str]]) -> str:
def clean_task(s):
return s.replace("Fixes: ", "").replace("Task-number: ", "")
return "".join(" - [{}] {}\n".format(clean_task(v["task"]), v["title"])
for _, v in d.items())
def sort_dict(d: Dict[str, Dict[str, str]]) -> Dict[str, Dict[str, str]]:
return dict(sorted(d.items(), key=lambda kv: kv[1]['task-number']))
if __name__ == "__main__":
args = parse_options()
pyside2_commits: Dict[str, Dict[str, str]] = {}
shiboken2_commits: Dict[str, Dict[str, str]] = {}
pyside2_changelogs: List[str] = []
shiboken2_changelogs: List[str] = []
# Getting commits information
directory = args.directory if args.directory else "."
versions = args.versions.split("..")
if len(versions) == 2:
if check_tag(versions[0]) and check_tag(versions[1]):
create_fixes_log(versions)
create_task_log(versions)
create_change_log(versions)
# Sort commits
pyside2_commits = sort_dict(pyside2_commits)
shiboken2_commits = sort_dict(shiboken2_commits)
# Generate message
print(content_header.replace("@VERSION", args.release).
replace("@TYPE", args.type))
print('\n'.join(pyside2_changelogs))
print(gen_list(pyside2_commits))
if not pyside2_changelogs and not pyside2_commits:
print(" - No changes")
print(shiboken_header)
print('\n'.join(shiboken2_changelogs))
print(gen_list(shiboken2_commits))
if not shiboken2_changelogs and not shiboken2_commits:
print(" - No changes")
|