changeset 3d174f4397b4 in trydevpi.tryton.org:default
details:
https://hg.tryton.org/trydevpi.tryton.org?cmd=changeset;node=3d174f4397b4
description:
Add support for local_version argument
It is needed to generate the egg information containing the same
version as
setup.py generates when installed from CI.
issue9928
review322831002
diffstat:
trydevpi.py | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diffs (55 lines):
diff -r 776077259ff3 -r 3d174f4397b4 trydevpi.py
--- a/trydevpi.py Sun Sep 27 17:06:46 2020 +0200
+++ b/trydevpi.py Thu Dec 10 22:47:14 2020 +0100
@@ -24,7 +24,7 @@
@cache.memoize(timeout=2 * 60 * 60)
-def get_urls(branch_filter=None, mirror=None):
+def get_urls(branch_filter=None, mirror=None, local_version=None):
urls = {}
lui = ui.ui()
lui.readconfig(unitolocal(app.config['HG_CONFIG']), trust=True)
@@ -55,8 +55,8 @@
last_major[max_version[0], max_version[1] + 1] = -1
for (major, minor), bug in last_major.items():
bug += 1
- version = get_version(major, minor, bug)
- last_series = max(last_series, (major, minor, bug))
+ version = get_version(major, minor, bug, local_version)
+ last_series = max(last_series, (major, minor, bug, local_version))
branch = get_branch(major, minor, mirror)
if (not repo.branchheads(unitolocal(branch))
or (branch_filter and branch != branch_filter)):
@@ -79,15 +79,18 @@
return 'trytond_%s' % name[len('modules/'):]
-def get_version(major, minor, bug):
+def get_version(major, minor, bug, local_version=None):
template = '%(major)s.%(minor)s.%(bug)s.dev0'
if minor % 2:
template = '%(major)s.%(minor)s.dev0'
- return template % {
+ version = template % {
'major': major,
'minor': minor,
'bug': bug,
}
+ if local_version:
+ version += '+' + local_version
+ return version
def get_branch(major, minor, mirror=None):
@@ -115,7 +118,9 @@
@app.route('/<branch>')
def index(branch=None):
mirror = request.args.get('mirror')
- return render_template('index.html', urls=get_urls(branch, mirror))
+ local_version = request.args.get('local_version')
+ return render_template(
+ 'index.html', urls=get_urls(branch, mirror, local_version))
if __name__ == '__main__':
