Skip to content

Correctly parse the new Windows binaries names (not a change of the website but of the script that builds release pages) #1035

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

Merged
dpiparo merged 1 commit into from
Nov 14, 2024
Merged

Correctly parse the new Windows binaries names (not a change of the website but of the script that builds release pages) #1035

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
6 changes: 3 additions & 3 deletions _releases/make-release-page.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,12 +261,12 @@ def binaryNameToTitle(filename):

return F"macOS {macOSVers} {arch} Xcode {xcodeVers}"
elif platformCompiler.startswith('win32') or platformCompiler.startswith('win64'):
regexWin = re.compile(r'^win(32|64)[.](vc[0-9]+)(.debug)?')
regexWin = re.compile(r'^win(32|64)[.](python3[0-9]+)[.](vc[0-9]+)(.debug)?')
Copy link
Member

@bellenot bellenot Nov 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't build debug anymore. Should we distribute relwithdebinfo? Or do we distribute only release binaries?

Copy link
Member Author

@dpiparo dpiparo Nov 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So far we have distributed release binaries: this can be changed if we believe that relwithdebinfo is useful to users. The regex is at the moment harmless, in the sense that in case debug binaries are available, the markdown of the page is generated accordingly. To be 100% correct, one should indeed detect the last part of the binary name and attach it to the name accordingly: release by default, debug in case we have debug binaries and release with debug info (see above necessity criterion)

matchWin = regexWin.match(platformCompiler)
if not matchWin:
print(F'ERROR: cannot parse Win32 MSVC version for {filename}')
return filename
(bitness, vcVers, debug) = matchWin.groups()
(bitness, pythonVers, vcVers, debug) = matchWin.groups()
if not debug:
debug = ''
else:
Expand All @@ -291,7 +291,7 @@ def binaryNameToTitle(filename):
bitArch = "x86"
else:
bitArch = "x64"
return F"Windows Visual Studio {versYear} {bitness}-bit {bitArch} {debug}"
return F"Windows Visual Studio {versYear} {bitness}-bit {bitArch}{debug}"
Copy link
Member

@bellenot bellenot Nov 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment here

else:
frameinfo = getframeinfo(currentframe())
print(F'ERROR: unknown platform {platformCompiler} for {filename}. Please edit {frameinfo.filename}:{frameinfo.lineno}')
Expand Down