From 7722aaf956ea65cb0d733ff25872702df5b80aaa Mon Sep 17 00:00:00 2001 From: C?dric Krier Date: Wed, 17 Jan 2018 17:56:49 +0100 Subject: [PATCH] Remove volumes from drone and fix test --- .drone.yml | 2 -- MANIFEST.in | 1 + setup.py | 2 +- tests/__init__.py | 12 +++++++----- tox.ini | 2 +- 5 files changed, 10 insertions(+), 9 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/MANIFEST.in b/MANIFEST.in index e013c00..ee910d7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,6 +5,7 @@ include CHANGELOG include LICENSE include tryton.cfg include *.xml +include *.csv include view/*.xml include locale/*.po include doc/* diff --git a/setup.py b/setup.py index 612a936..c9880b9 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ setup(name='%s_%s' % (PREFIX, MODULE), package_data={ 'trytond.modules.%s' % MODULE: (info.get('xml', []) + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt', - 'icons/*.svg', 'tests/*.rst']), + 'icons/*.svg', 'tests/*.rst', '*.csv']), }, classifiers=[ 'Development Status :: 5 - Production/Stable', diff --git a/tests/__init__.py b/tests/__init__.py index ab41db6..b458fe3 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,7 +1,9 @@ -#This file is part bank_es module for Tryton. -#The COPYRIGHT file at the top level of this repository contains -#the full copyright notices and license terms. - -from .test_country_zip_es import suite +# This file is part bank_es module for Tryton. +# The COPYRIGHT file at the top level of this repository contains +# the full copyright notices and license terms. +try: + from trytond.modules.country_zip_es.tests.test_country_zip_es import suite +except ImportError: + from .test_country_zip_es 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}