changeset e02062aadf1d in cookiecutter:default
details: https://hg.tryton.org/cookiecutter?cmd=changeset;node=e02062aadf1d
description:
Manage local version in tox and do not set local_version when no CI
issue9928
diffstat:
{{ cookiecutter.module_name }}/.drone.yml | 2 +-
{{ cookiecutter.module_name }}/setup.py | 13 ++++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diffs (49 lines):
diff -r 916141498322 -r e02062aadf1d {{ cookiecutter.module_name }}/.drone.yml
--- a/{{ cookiecutter.module_name }}/.drone.yml Thu Dec 10 23:06:28 2020 +0100
+++ b/{{ cookiecutter.module_name }}/.drone.yml Fri Dec 11 13:51: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
- POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
commands:
- echo "[extensions]" >> /root/.hgrc
diff -r 916141498322 -r e02062aadf1d {{ cookiecutter.module_name }}/setup.py
--- a/{{ cookiecutter.module_name }}/setup.py Thu Dec 10 23:06:28 2020 +0100
+++ b/{{ cookiecutter.module_name }}/setup.py Fri Dec 11 13:51:43 2020 +0100
@@ -53,15 +53,19 @@
download_url = (
'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
name[8:], name, version))
+{% endif %}
local_version = []
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)
-{% endif %}
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res)(\W|$)', dep):
@@ -80,7 +84,10 @@
{%- endif %}
dependency_links = []
if minor_version % 2:
- dependency_links.append('https://trydevpi.tryton.org/{% if
cookiecutter.prefix %}?mirror=github{% endif %}')
+ dependency_links.append(
+ 'https://trydevpi.tryton.org/?local_version='
+ + '.'.join(local_version)
+ {% if cookiecutter.prefix %}+ '&mirror=github'{% endif %})
setup(name=name,
version=version,
