changeset 4626fb6fe8f0 in tryton:default
details: https://hg.tryton.org/tryton?cmd=changeset;node=4626fb6fe8f0
description:
Manage local version in tox and do not set local_version when no CI
issue9928
diffstat:
.drone.yml | 3 +++
setup.py | 13 ++++++++++++-
2 files changed, 15 insertions(+), 1 deletions(-)
diffs (46 lines):
diff -r 611dee1e3a71 -r 4626fb6fe8f0 .drone.yml
--- a/.drone.yml Thu Dec 10 23:05:58 2020 +0100
+++ b/.drone.yml Fri Dec 11 13:51:54 2020 +0100
@@ -9,6 +9,9 @@
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 -r 611dee1e3a71 -r 4626fb6fe8f0 setup.py
--- a/setup.py Thu Dec 10 23:05:58 2020 +0100
+++ b/setup.py Fri Dec 11 13:51:54 2020 +0100
@@ -78,10 +78,20 @@
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 @@
extras_require={
'calendar': ['GooCalendar>=0.7'],
},
+ dependency_links=dependency_links,
zip_safe=False,
test_suite='tryton.tests',
**args
