changeset 4dceebeb94c2 in trytond-gis:5.6 details: https://hg.tryton.org/trytond-gis?cmd=changeset;node=4dceebeb94c2 description: Add support for local_version on trydevpi.tryton.org
issue9928 diffstat: .drone.yml | 2 +- setup.py | 16 ++++++++++++---- tox.ini | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diffs (54 lines): diff -r 52fc93a29240 -r 4dceebeb94c2 .drone.yml --- a/.drone.yml Mon May 04 12:04:18 2020 +0200 +++ b/.drone.yml Fri Dec 11 15:44:43 2020 +0100 @@ -12,7 +12,7 @@ environment: - CFLAGS=-O0 - DB_CACHE=/cache - - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE + - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER CI_JOB_NUMBER CI_JOB_ID - POSTGIS_URI=postgis://postgres@postgresql:5432/ commands: - echo "[extensions]" >> /root/.hgrc diff -r 52fc93a29240 -r 4dceebeb94c2 setup.py --- a/setup.py Mon May 04 12:04:18 2020 +0200 +++ b/setup.py Fri Dec 11 15:44:43 2020 +0100 @@ -41,9 +41,15 @@ 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']: + if os.environ.get(build): + local_version.append(os.environ[build]) + else: + local_version = [] + break if local_version: version += '+' + '.'.join(local_version) @@ -52,7 +58,9 @@ tests_require = [] dependency_links = [] if minor_version % 2: - dependency_links.append('https://trydevpi.tryton.org/') + dependency_links.append( + 'https://trydevpi.tryton.org/?local_version=' + + '.'.join(local_version)) setup(name=name, diff -r 52fc93a29240 -r 4dceebeb94c2 tox.ini --- a/tox.ini Mon May 04 12:04:18 2020 +0200 +++ b/tox.ini Fri Dec 11 15:44:43 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}