Remove volumes for drone and fix dependency links

This commit is contained in:
C?dric Krier 2018-01-10 10:53:40 +01:00
parent 6336d9e863
commit 71e647548f
5 changed files with 27 additions and 10 deletions

View file

@ -13,8 +13,6 @@ pipeline:
commands:
- pip install tox
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
services:
postgresql:

View file

@ -10,10 +10,13 @@ __all__ = ['Company']
class Company:
__metaclass__ = PoolMeta
__name__ = 'company.company'
invoice_qty = fields.Boolean('Invoice Qty', help='Show qty without decimals')
invoice_qty = fields.Boolean(
'Invoice Qty', help='Show qty without decimals')
sale_qty = fields.Boolean('Sale Qty', help='Show qty without decimals')
purchase_qty = fields.Boolean('Purchase Qty', help='Show qty without decimals')
shipment_qty = fields.Boolean('Shipment Qty', help='Show qty without decimals')
purchase_qty = fields.Boolean(
'Purchase Qty', help='Show qty without decimals')
shipment_qty = fields.Boolean(
'Shipment Qty', help='Show qty without decimals')
invoice_header = fields.Char('Invoice Header', translate=True)
invoice_footer = fields.Char('Invoice Footer', translate=True)
invoice_background = fields.Char('Invoice Background', translate=True)

View file

@ -14,7 +14,9 @@ except ImportError:
MODULE = 'jasper_reports_options'
PREFIX = 'trytonzz'
MODULE2PREFIX = {}
MODULE2PREFIX = {
'jasper_reports': 'trytonspain',
}
def read(fname):
@ -51,7 +53,19 @@ for dep in info.get('depends', []):
requires.append(get_require_version('trytond'))
tests_require = [get_require_version('proteus')]
dependency_links = []
series = '%s.%s' % (major_version, minor_version)
if minor_version % 2:
branch = 'default'
else:
branch = series
dependency_links = [
('hg+https://bitbucket.org/trytonspain/'
'trytond-jasper_reports@%(branch)s'
'#egg=trytonspain-jasper_reports-%(series)s' % {
'branch': branch,
'series': series,
}),
]
if minor_version % 2:
# Add development index for testing with proteus
dependency_links.append('https://trydevpi.tryton.org/')

View file

@ -1,7 +1,9 @@
# This file is part jasper_reports_options module for Tryton.
# The COPYRIGHT file at the top level of this repository contains
# the full copyright notices and license terms.
from .test_jasper_reports_options import suite
try:
from trytond.modules.jasper_reports_options.tests.test_jasper_reports_options import suite
except ImportError:
from .test_jasper_reports_options import suite
__all__ = ['suite']

View file

@ -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 --find-links https://trydevpi.tryton.org/ --process-dependency-links {opts} {packages}