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.

@glx22 glx22 force-pushed the glx22:fix100 branch from e6e27d6 to c3e37c0 Apr 24, 2020
nml/version_info.py Outdated Show resolved Hide resolved
nml/version_info.py Outdated Show resolved Hide resolved
@glx22 glx22 force-pushed the glx22:fix100 branch from 9bb14bd to 4f53490 Apr 24, 2020
Copy link
Member

@LordAro LordAro left a comment

LGTM

@glx22 glx22 merged commit 7cbd236 into OpenTTD:master Apr 28, 2020
15 checks passed
15 checks passed
Python 3.5 on ubuntu-latest
Details
Python 3.x on ubuntu-latest
Details
Python 3.6 on ubuntu-latest
Details
Python 3.x on macOS-latest
Details
Python 3.7 on ubuntu-latest
Details
Python 3.x on windows-2016
Details
Python 3.8 on ubuntu-latest
Details
Python 3.5 on macOS-latest
Details
Python 3.6 on macOS-latest
Details
Python 3.7 on macOS-latest
Details
Python 3.8 on macOS-latest
Details
Python 3.5 on windows-2016
Details
Python 3.6 on windows-2016
Details
Python 3.7 on windows-2016
Details
Python 3.8 on windows-2016
Details
@glx22 glx22 deleted the glx22:fix100 branch Apr 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants