changeset d6fe303c5c35 in trytond-gis:default
details: https://hg.tryton.org/trytond-gis?cmd=changeset;node=d6fe303c5c35
description:
Add support for local_version on trydevpi.tryton.org
issue9928
diffstat:
setup.py | 8 +++++---
tox.ini | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diffs (27 lines):
diff -r 63527660facd -r d6fe303c5c35 setup.py
--- a/setup.py Mon Nov 02 15:38:44 2020 +0100
+++ b/setup.py Thu Dec 10 23:05:59 2020 +0100
@@ -41,9 +41,11 @@
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 -r 63527660facd -r d6fe303c5c35 tox.ini
--- a/tox.ini Mon Nov 02 15:38:44 2020 +0100
+++ b/tox.ini Thu Dec 10 23:05:59 2020 +0100
@@ -6,4 +6,4 @@
setenv =
TRYTOND_DATABASE_URI={env:POSTGIS_URI:postgis://}
DB_NAME={env:POSTGIS_NAME:test}
-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}
