Skip to content

Fix salt version PEP440 compliance - #59359

Merged
s0undt3ch merged 5 commits into
saltstack:masterfrom
s0undt3ch:hotfix/setup-tests
Jan 27, 2021
Merged

s0undt3ch merged 5 commits into
saltstack:masterfrom
s0undt3ch:hotfix/setup-tests

Conversation

@s0undt3ch

Copy link
Copy Markdown
Contributor

What does this PR do?

Fix PEP440 compliance.

The wheel metadata version 1.2 states that the package version MUST be
PEP440 compliant.

This means that instead of 3002.2-511-g033c53eccb, the salt version
string should look like 3002.2+511.g033c53eccb, a post release of
3002.2 ahead by 511 commits with the git sha 033c53eccb

@s0undt3ch
s0undt3ch requested review from bryceml and krionbsd January 26, 2021 09:29
@s0undt3ch
s0undt3ch requested a review from a team as a code owner January 26, 2021 09:29
krionbsd
krionbsd previously approved these changes Jan 26, 2021
The wheel metadata version 1.2 states that the package version MUST be
PEP440 compliant.

This means that instead of `3002.2-511-g033c53eccb`, the salt version
string should look like `3002.2+511.g033c53eccb`, a post release of
`3002.2` ahead by 511 commits with the git sha `033c53eccb`
bryceml
bryceml previously approved these changes Jan 26, 2021

@bryceml bryceml left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good to me, I do wonder if we should remove anything from the regex that's not pep440 compliant, like nb, not sure if alpha or beta are pep440 compliant either.

@s0undt3ch
s0undt3ch force-pushed the hotfix/setup-tests branch 3 times, most recently from 8a58120 to 7ff0a23 Compare January 27, 2021 08:59
@krionbsd
krionbsd self-requested a review January 27, 2021 09:02
krionbsd
krionbsd previously approved these changes Jan 27, 2021
@s0undt3ch
s0undt3ch merged commit 9173f08 into saltstack:master Jan 27, 2021
@s0undt3ch
s0undt3ch deleted the hotfix/setup-tests branch January 27, 2021 11:19
saltstack-formulas-github pushed a commit to netmanagers/salt-image-builder that referenced this pull request Feb 4, 2021
@sagetherage sagetherage added the Aluminium Release Post Mg and Pre Si label Feb 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Aluminium Release Post Mg and Pre Si

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants