From aa8c35bf599dad1f0dff825ba4e7d5816010da51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 11 Dec 2020 13:51:54 +0100 Subject: [PATCH] Manage local version in tox and do not set local_version when no CI issue9928 --- .drone.yml | 3 +++ setup.py | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 688907d2b1..56edd9b47d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,6 +9,9 @@ clone: pipeline: tox: image: ${IMAGE} + environment: + - CFLAGS=-O0 + - TOX_TESTENV_PASSENV=CFLAGS CI_BUILD_NUMBER CI_JOB_NUMBER CI_JOB_ID commands: - pip install tox - tox -e "${TOXENV}" diff --git a/setup.py b/setup.py index b85c6b3e1c..e3f65fe79b 100755 --- a/setup.py +++ b/setup.py @@ -78,10 +78,20 @@ 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 os.environ.get(build): + local_version.append(os.environ[build]) + else: + local_version = [] + break if local_version: version += '+' + '.'.join(local_version) +dependency_links = [] +if minor_version % 2: + dependency_links.append( + 'https://trydevpi.tryton.org/?local_version=' + + '.'.join(local_version)) + dist = setup(name=name, version=version, description='Tryton desktop client', @@ -145,6 +155,7 @@ dist = setup(name=name, extras_require={ 'calendar': ['GooCalendar>=0.7'], }, + dependency_links=dependency_links, zip_safe=False, test_suite='tryton.tests', **args