changeset 4df41356acd7 in modules/attendance:default
details:
https://hg.tryton.org/modules/attendance?cmd=changeset;node=4df41356acd7
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 893221ac9f50 -r 4df41356acd7 setup.py
--- a/setup.py Tue Dec 08 17:39:22 2020 +0100
+++ b/setup.py Thu Dec 10 23:05:56 2020 +0100
@@ -48,9 +48,11 @@
'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 -r 893221ac9f50 -r 4df41356acd7 tox.ini
--- a/tox.ini Tue Dec 08 17:39:22 2020 +0100
+++ b/tox.ini Thu Dec 10 23:05:56 2020 +0100
@@ -12,4 +12,4 @@
postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
sqlite: DB_NAME={env:SQLITE_NAME::memory:}
postgresql: DB_NAME={env:POSTGRESQL_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}
