Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: parse tags in utf8 explicitly in python #13163

Merged
merged 1 commit into from
Jul 26, 2023
Merged

chore: parse tags in utf8 explicitly in python #13163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions scripts/python_build_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ def _latest_tag_for_prefix(prefix, git_dir):
'Could not find tag in {check_dir} matching {prefix} '.format(
check_dir=check_dir, prefix=prefix)
+ '- build before release or no tags. Using 0.0.0-dev\n')
tags_result = prefix.encode() + b'0.0.0-dev'
tags_result = prefix.encode('utf-8') + b'0.0.0-dev'
tags_matching = tags_result.strip().split(b'\n')
return tags_matching[-1].decode()
return tags_matching[-1].decode('utf-8')

def _latest_version_for_project(project, git_dir):
prefix = project_entries[project].tag_prefix
Expand All @@ -95,11 +95,11 @@ def _ref_from_sha(sha):
# it exists. Then all the tag and head refs
branch_name = subprocess.check_output(
['git', 'rev-parse', '--symbolic-full-name', '--verify', '--quiet', 'HEAD'],
cwd=CWD).strip().decode().split('\n')
cwd=CWD).strip().decode('utf-8').split('\n')

allrefs = subprocess.check_output(
['git', 'show-ref', '--tags', '--heads'],
cwd=CWD).strip().decode().split('\n')
cwd=CWD).strip().decode('utf-8').split('\n')
# Keep...
matching = [
this_ref for this_sha, this_ref in # the refs
Expand Down Expand Up @@ -137,7 +137,7 @@ def dump_br_version(package, project, extra_tag='', git_dir=None):
"""
normalized = get_version(package, project, extra_tag, git_dir)
sha = subprocess.check_output(
['git', 'rev-parse', 'HEAD'], cwd=CWD).strip().decode()
['git', 'rev-parse', 'HEAD'], cwd=CWD).strip().decode('utf-8')
branch = _ref_from_sha(sha)
pref = package_entries[package].br_version_prefix
return json.dumps({pref+'_version': normalized,
Expand Down
Loading