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.

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

Fix version parsing #739

Merged
merged 2 commits into from
Nov 21, 2023
Merged

Conversation

fcollonval
Copy link
Collaborator

@fcollonval fcollonval commented Nov 20, 2023

Follow-up of 4.0.0 release

Xref #659 (comment)

@fcollonval fcollonval added the bug label Nov 20, 2023
version_info = VersionInfo(
int(groups["major"]),
int(groups["minor"]),
int(groups["micro"]),
_specifier_[groups.get("releaselevel", "")],
_specifier_.get(groups.get("releaselevel", ""), "final"),
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm not sure if this is the right choice: if someone makes a mistake and bumps to "beta" instead of "b", then it will default to final since it cannot parse it?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Would you mind sharing what error you were seeing that this will fix?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
_specifier_.get(groups.get("releaselevel", ""), "final"),
_specifier_[groups.get("releaselevel") or ""],

Copy link
Collaborator Author

@fcollonval fcollonval Nov 21, 2023

Choose a reason for hiding this comment

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

The error is that if not found groups.get("releaselevel") is None. Therefore, as None is not a key of _specificer, it raises an KeyError.

I'll go for a more advance solution than Vidar's proposal as the proposed solution does not address the case of release level being beta for example.

Copy link
Collaborator

Choose a reason for hiding this comment

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

My point was that "beta" would be an invalid value that should throw an error. Somewhere at least.. probably not good for it to throw in packaged code though, so this change is fine. But yes, let's try to get a regression test for the future as well.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

For documentation, beta is a valid specifier: https://peps.python.org/pep-0440/#pre-release-spelling

@fcollonval
Copy link
Collaborator Author

Merging and releasing a patch version

@fcollonval fcollonval merged commit 89548a7 into jupyter:master Nov 21, 2023
15 checks passed
@fcollonval fcollonval deleted the fix/version_parsing branch November 21, 2023 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants