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 #100: follow PEP440 when generating version #102

Merged
merged 2 commits into from Apr 28, 2020
Merged

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented Apr 23, 2020

Previous, and invalid, version format was <year>-<month>-<day>[-<branch>]-g<changeset>[M].
I replaced it with <next nml version>.dev<year><month><day>+[branch.]g<changeset>[m].
For releases it will still use <tag>[m], and a modified tag source will be considered as invalid.

nml/version_info.py Outdated Show resolved Hide resolved
nml/version_info.py Outdated Show resolved Hide resolved
Copy link
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

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

LGTM

@glx22 glx22 merged commit 7cbd236 into OpenTTD:master Apr 28, 2020
@glx22 glx22 deleted the fix100 branch April 28, 2020 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants