From 832b837af03ab0b27a082e663ef4e2d45167ddc2 Mon Sep 17 00:00:00 2001 From: Taverne Sylvain Date: Thu, 4 May 2017 14:22:09 +0200 Subject: [PATCH] Build: use X.XX.X.devXXXXX pattern for versions To be compliant with pep 0440 https://www.python.org/dev/peps/pep-0440/ --- itools/pkg/build.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/itools/pkg/build.py b/itools/pkg/build.py index 3f3461905..72c4d63c7 100644 --- a/itools/pkg/build.py +++ b/itools/pkg/build.py @@ -117,17 +117,15 @@ def make_version(worktree): # Try to get the branch branch = worktree.get_branch_name() branch = branch or 'nobranch' - if tag and tag.startswith(branch): branch = tag - # Get the timestamp head = worktree.get_metadata() timestamp = head['committer_date'] timestamp = timestamp.strftime('%Y%m%d%H%M') # Build a version from the branch and the timestamp - return '{}-{}'.format(branch, timestamp) + return '{}.dev{}'.format(branch, timestamp) def build(path, config, environment):