From 57fa19ac888a0e7f47ac2a0e872bdc30a7ed213d Mon Sep 17 00:00:00 2001 From: C?dric Krier Date: Wed, 24 Jan 2018 15:51:40 +0100 Subject: [PATCH] Remove volumes from drone and fix test --- .drone.yml | 2 -- setup.py | 23 +++++++++++++++++------ tests/__init__.py | 6 ++++-- tox.ini | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index e0bc2f7..9f91ecb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,8 +13,6 @@ pipeline: commands: - pip install tox - tox -e "${TOXENV}-${DATABASE}" - volumes: - - cache:/root/.cache services: postgresql: diff --git a/setup.py b/setup.py index dce53dc..df522df 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,9 @@ except ImportError: MODULE = 'stock_comment' PREFIX = 'trytonzz' -MODULE2PREFIX = {} +MODULE2PREFIX = { + 'party_comment': 'trytonspain', + } def read(fname): @@ -50,8 +52,20 @@ for dep in info.get('depends', []): requires.append(get_require_version('%s_%s' % (prefix, dep))) requires.append(get_require_version('trytond')) -tests_require = [get_require_version('proteus')] -dependency_links = [] +tests_require = [] +series = '%s.%s' % (major_version, minor_version) +if minor_version % 2: + branch = 'default' +else: + branch = series +dependency_links = [ + ('hg+https://bitbucket.org/trytonspain/' + 'trytond-party_comment@%(branch)s' + '#egg=trytonspain-party_comment-%(series)s' % { + 'branch': branch, + 'series': series, + }), + ] if minor_version % 2: # Add development index for testing with proteus dependency_links.append('https://trydevpi.tryton.org/') @@ -117,7 +131,4 @@ setup(name='%s_%s' % (PREFIX, MODULE), test_loader='trytond.test_loader:Loader', tests_require=tests_require, use_2to3=True, - convert_2to3_doctests=[ - 'tests/scenario_stock_comment.rst', - ], ) diff --git a/tests/__init__.py b/tests/__init__.py index 06323ea..94401a3 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,7 +1,9 @@ # This file is part stock_comment module for Tryton. # The COPYRIGHT file at the top level of this repository contains # the full copyright notices and license terms. - -from .test_stock_comment import suite +try: + from trytond.modules.stock_comment.tests.test_stock_comment import suite +except ImportError: + from .test_stock_comment import suite __all__ = ['suite'] diff --git a/tox.ini b/tox.ini index 527d859..3d844ea 100644 --- a/tox.ini +++ b/tox.ini @@ -15,4 +15,4 @@ setenv = sqlite: DB_NAME={env:SQLITE_NAME::memory:} postgresql: DB_NAME={env:POSTGRESQL_NAME:test} mysql: DB_NAME={env:MYSQL_NAME:test} -install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages} +install_command = pip install --pre --process-dependency-links {opts} {packages}