pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
MrDraw/.versioneer-lookup

23 lines
820 B
Text
Raw Normal View History

Modified versioneer to allow specification of manual versions based on branches You can now define a lookup file explicitely mapping virtual version tags to branches via regular expressions and a reference commit from which the commit distance will be calculated. Format of the file is <branch-regex> <tag> <reference commit> The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out, the lookup table does not apply to the matched branches and the regular versioneer resolution (via git describe) takes place. Current configuration makes "master", "staging" and any branch starting with "fix/" make use the default behaviour, all other branches (so basically all development branches) are defined as "1.2.0-dev"
2014-09-02 09:35:42 +00:00
# Configuration file for the versioneer lookup, manually mapping tags based on branches
#
# Format is
#
# <branch-regex> <tag> <reference commit>
#
# The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out,
# the lookup table does not apply to the matched branches
maintenance branch is 1.2.1-dev for now This branch is for preparing the next patch-releases of the current stable release on the master branch.
2015-06-25 09:00:14 +00:00
# master shall not use the lookup table, only tags
Modified versioneer to allow specification of manual versions based on branches You can now define a lookup file explicitely mapping virtual version tags to branches via regular expressions and a reference commit from which the commit distance will be calculated. Format of the file is <branch-regex> <tag> <reference commit> The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out, the lookup table does not apply to the matched branches and the regular versioneer resolution (via git describe) takes place. Current configuration makes "master", "staging" and any branch starting with "fix/" make use the default behaviour, all other branches (so basically all development branches) are defined as "1.2.0-dev"
2014-09-02 09:35:42 +00:00
master
maintenance branch is now 1.2.7-dev
2015-09-02 18:18:18 +00:00
# maintenance is currently the branch for preparation of maintenance release 1.2.7
maintenance branch is 1.2.1-dev for now This branch is for preparing the next patch-releases of the current stable release on the master branch.
2015-06-25 09:00:14 +00:00
# so are any fix/... branches
maintenance branch is now 1.2.7-dev
2015-09-02 18:18:18 +00:00
maintenance 1.2.7-dev 536bb31965db17b969e7c1c53e241ddac4ae1814
fix/.* 1.2.7-dev 536bb31965db17b969e7c1c53e241ddac4ae1814
Modified versioneer to allow specification of manual versions based on branches You can now define a lookup file explicitely mapping virtual version tags to branches via regular expressions and a reference commit from which the commit distance will be calculated. Format of the file is <branch-regex> <tag> <reference commit> The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out, the lookup table does not apply to the matched branches and the regular versioneer resolution (via git describe) takes place. Current configuration makes "master", "staging" and any branch starting with "fix/" make use the default behaviour, all other branches (so basically all development branches) are defined as "1.2.0-dev"
2014-09-02 09:35:42 +00:00
versioneer lookup: add support for detached checkouts When doing 'git checkout <rev>' or 'git checkout <tag>' there will be no branch info: $ git branch * (detached from 96fc70b) After whitelisting '\(detached.*' we get: $ python setup.py version running version got version from git {'version': '1.2.5-1-gfd73e02', 'branch': 'HEAD', 'full': 'fd73e02f4fa9f286407ad688feeeee3ebaffea60'} Version is currently: 1.2.5-1-gfd73e02 The '-1-gfd73e02' is this commit on top of the 1.2.5 tag. While detached checkouts should be discouraged some buildsystems (e.g. OpenEmbedded) have no real way to avoid it, which is what this patch fixes. Actual people doing a checkout should use a branch. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> (cherry picked from commit 987e637)
2015-09-01 06:58:57 +00:00
# Special case disconnected checkouts, e.g. 'git checkout <tag>'
Fixed versioneer lookup file again Runaway regex ;) (cherry picked from commit 78277ac)
2015-09-02 08:03:39 +00:00
\(detached.*
versioneer lookup: add support for detached checkouts When doing 'git checkout <rev>' or 'git checkout <tag>' there will be no branch info: $ git branch * (detached from 96fc70b) After whitelisting '\(detached.*' we get: $ python setup.py version running version got version from git {'version': '1.2.5-1-gfd73e02', 'branch': 'HEAD', 'full': 'fd73e02f4fa9f286407ad688feeeee3ebaffea60'} Version is currently: 1.2.5-1-gfd73e02 The '-1-gfd73e02' is this commit on top of the 1.2.5 tag. While detached checkouts should be discouraged some buildsystems (e.g. OpenEmbedded) have no real way to avoid it, which is what this patch fixes. Actual people doing a checkout should use a branch. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> (cherry picked from commit 987e637)
2015-09-01 06:58:57 +00:00
Devel is now 1.3 (cherry picked from commit dd5bf2e)
2015-06-25 08:50:54 +00:00
# every other branch is a development branch and thus gets resolved to 1.3.0-dev for now
.* 1.3.0-dev 198d3450d94be1a2
Reference in a new issue Copy permalink