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

[python] Only add maturity/suffix to version if groups matched #1146

Merged
merged 5 commits into from
Jan 11, 2024
Merged

[python] Only add maturity/suffix to version if groups matched #1146

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
795ee12
Only add maturity/suffix if groups matched
mcm001 Jan 10, 2024
9646f40
Update setup.py
mcm001 Jan 10, 2024
fc53ce4
Update setup.py
mcm001 Jan 10, 2024
47133f8
Update setup.py
mcm001 Jan 10, 2024
1438644
Merge branch 'master' into 2023-01-10_pep_version
gerth2 Jan 11, 2024
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
22 changes: 18 additions & 4 deletions photon-lib/py/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,24 @@
# which should be PEP440 compliant
if m:
versionString = m.group(0)
prefix = m.group(1)
maturity = m.group(2)
suffix = m.group(3).replace(".", "")
versionString = f"{prefix}.{maturity}.{suffix}"
# Hack -- for strings like v2024.1.1, do NOT add matruity/suffix
if len(m.group(2)) > 0:
print("using beta group matcher")
prefix = m.group(1)
maturity = m.group(2)
suffix = m.group(3).replace(".", "")
versionString = f"{prefix}.{maturity}.{suffix}"
else:
split = gitDescribeResult.split("-")
if len(split) == 3:
year, commits, sha = split
# Chop off leading v from "v2024.1.2", and use "post" for commits to master since
versionString = f"{year[1:]}post{commits}"
print("using dev release " + versionString)
else:
year = gitDescribeResult
versionString = year[1:]
print("using full release " + versionString)


else:
Expand Down
Loading