From bd9d02ed1dea8c7bf79c7f5e2913b032c7fa09a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 10 Dec 2020 23:05:58 +0100
Subject: [PATCH] Add support for local_version on trydevpi.tryton.org

issue9928
---
 setup.py | 8 +++++---
 tox.ini  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 46051e8b7a..850ebaa1a2 100755
--- a/setup.py
+++ b/setup.py
@@ -41,9 +41,11 @@ if minor_version % 2:
     download_url = 'hg+http://hg.tryton.org/%s#egg=%s-%s' % (
         name, name, version)
 local_version = []
-for build in ['CI_BUILD_NUMBER', 'CI_JOB_NUMBER', 'CI_JOB_ID']:
-    if os.environ.get(build):
-        local_version.append(os.environ[build])
+if os.environ.get('CI_JOB_ID'):
+    local_version.append(os.environ['CI_JOB_ID'])
+else:
+    for build in ['CI_BUILD_NUMBER', 'CI_JOB_NUMBER']:
+        local_version.append(os.environ.get(build, ''))
 if local_version:
     version += '+' + '.'.join(local_version)
 
diff --git a/tox.ini b/tox.ini
index 839cee7696..48761fe356 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,4 +7,4 @@ deps =
 setenv =
     TRYTOND_DATABASE_URI={env:TRYTOND_DATBASE_URI:sqlite://}
     DB_NAME={env:DB_NAME::memory:}
-install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/?local_version={env:CI_JOB_ID:{env:CI_BUILD_NUMBER}.{env:CI_JOB_NUMBER}} {opts} {packages}