From 16573ceda9bfd369589d25fc2bd3a512e7e6eaf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= 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 1ea7e93d45..75a6816787 100755 --- a/setup.py +++ b/setup.py @@ -45,9 +45,11 @@ if minor_version % 2: 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % ( name[8:], 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 e1e2be2ab6..5129a5e7a6 100644 --- a/tox.ini +++ b/tox.ini @@ -13,4 +13,4 @@ setenv = sqlite: DB_NAME={env:SQLITE_NAME::memory:} postgresql: DB_NAME={env:POSTGRESQL_NAME:test} passenv=DPD_USER_ID DPD_PASSWORD -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}