Migration to 5.0
This commit is contained in:
parent
3090fcf6dc
commit
d422cf9b22
12
.drone.yml
12
.drone.yml
|
@ -32,15 +32,15 @@ services:
|
|||
|
||||
matrix:
|
||||
include:
|
||||
- IMAGE: python:2.7
|
||||
TOXENV: py27
|
||||
DATABASE: sqlite
|
||||
- IMAGE: python:2.7
|
||||
TOXENV: py27
|
||||
DATABASE: postgresql
|
||||
- IMAGE: python:3.6
|
||||
TOXENV: py36
|
||||
DATABASE: sqlite
|
||||
- IMAGE: python:3.6
|
||||
TOXENV: py36
|
||||
DATABASE: postgresql
|
||||
- IMAGE: python:3.7
|
||||
TOXENV: py37
|
||||
DATABASE: sqlite
|
||||
- IMAGE: python:3.7
|
||||
TOXENV: py37
|
||||
DATABASE: postgresql
|
1
INSTALL
1
INSTALL
|
@ -4,7 +4,6 @@ Installing datalife_sale_cost_apply_invoice
|
|||
Prerequisites
|
||||
-------------
|
||||
|
||||
* Python 2.7 or later (http://www.python.org/)
|
||||
* trytond (http://www.tryton.org/)
|
||||
|
||||
Installation
|
||||
|
|
|
@ -5,9 +5,8 @@ from trytond.pool import PoolMeta
|
|||
__all__ = ['InvoiceLine']
|
||||
|
||||
|
||||
class InvoiceLine:
|
||||
class InvoiceLine(metaclass=PoolMeta):
|
||||
__name__ = 'account.invoice.line'
|
||||
__metaclass__ = PoolMeta
|
||||
|
||||
@classmethod
|
||||
def _get_origin(cls):
|
||||
|
|
|
@ -9,14 +9,12 @@ from trytond.modules.document_cost_apply_invoice.cost import (
|
|||
__all__ = ['CostType', 'CostTemplate', 'SaleCost']
|
||||
|
||||
|
||||
class CostType(ApplyMethodCostMixin):
|
||||
class CostType(ApplyMethodCostMixin, metaclass=PoolMeta):
|
||||
__name__ = 'sale.cost.type'
|
||||
__metaclass__ = PoolMeta
|
||||
|
||||
|
||||
class CostTemplate:
|
||||
class CostTemplate(metaclass=PoolMeta):
|
||||
__name__ = 'sale.cost.template'
|
||||
__metaclass__ = PoolMeta
|
||||
|
||||
invoice_party = fields.Many2One('party.party', 'Invoice Party',
|
||||
states={
|
||||
|
@ -30,9 +28,8 @@ class CostTemplate:
|
|||
self.invoice_party = self.type_.invoice_party
|
||||
|
||||
|
||||
class SaleCost(ApplyMethodCostDocumentMixin):
|
||||
class SaleCost(ApplyMethodCostDocumentMixin, metaclass=PoolMeta):
|
||||
__name__ = 'sale.cost'
|
||||
__metaclass__ = PoolMeta
|
||||
|
||||
def on_change_template(self):
|
||||
super(SaleCost, self).on_change_template()
|
||||
|
|
19
setup.py
19
setup.py
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
# The COPYRIGHT file at the top level of this repository contains
|
||||
# the full copyright notices and license terms.
|
||||
|
||||
|
@ -6,10 +6,7 @@ from setuptools import setup, find_packages
|
|||
import re
|
||||
import os
|
||||
import io
|
||||
try:
|
||||
from configparser import ConfigParser
|
||||
except ImportError:
|
||||
from ConfigParser import ConfigParser
|
||||
from configparser import ConfigParser
|
||||
|
||||
MODULE2PREFIX = {
|
||||
'sale_cost': 'datalife',
|
||||
|
@ -23,6 +20,7 @@ def read(fname):
|
|||
'r', encoding='utf-8').read()
|
||||
|
||||
|
||||
|
||||
def get_require_version(name):
|
||||
if minor_version % 2:
|
||||
require = '%s >= %s.%s.dev0, < %s.%s'
|
||||
|
@ -33,6 +31,7 @@ def get_require_version(name):
|
|||
return require
|
||||
|
||||
|
||||
|
||||
config = ConfigParser()
|
||||
config.readfp(open('tryton.cfg'))
|
||||
info = dict(config.items('tryton'))
|
||||
|
@ -72,12 +71,15 @@ requires = []
|
|||
for dep in info.get('depends', []):
|
||||
if not re.match(r'(ir|res)(\W|$)', dep):
|
||||
prefix = MODULE2PREFIX.get(dep, 'trytond')
|
||||
|
||||
req = get_require_version('%s_%s' % (prefix, dep))
|
||||
if dep in dependency_links:
|
||||
req = '%s_%s @ %s' % (prefix, dep, dependency_links[dep])
|
||||
requires.append(req)
|
||||
|
||||
requires.append(get_require_version('trytond'))
|
||||
|
||||
|
||||
tests_require = [get_require_version('proteus')]
|
||||
|
||||
dependency_links = list(dependency_links.values())
|
||||
|
@ -125,15 +127,16 @@ setup(name=name,
|
|||
'Natural Language :: Slovenian',
|
||||
'Natural Language :: Spanish',
|
||||
'Operating System :: OS Independent',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
'Programming Language :: Python :: 3.4',
|
||||
'Programming Language :: Python :: 3.5',
|
||||
'Programming Language :: Python :: 3.6',
|
||||
'Programming Language :: Python :: 3.7',
|
||||
'Programming Language :: Python :: Implementation :: CPython',
|
||||
'Programming Language :: Python :: Implementation :: PyPy',
|
||||
'Topic :: Office/Business',
|
||||
],
|
||||
license='GPL-3',
|
||||
python_requires='>=3.4',
|
||||
install_requires=requires,
|
||||
dependency_links=dependency_links,
|
||||
zip_safe=False,
|
||||
|
@ -144,8 +147,4 @@ setup(name=name,
|
|||
test_suite='tests',
|
||||
test_loader='trytond.test_loader:Loader',
|
||||
tests_require=tests_require,
|
||||
use_2to3=True,
|
||||
convert_2to3_doctests=[
|
||||
'tests/scenario_sale_cost_apply_invoice.rst',
|
||||
],
|
||||
)
|
||||
|
|
13
tox.ini
13
tox.ini
|
@ -1,18 +1,15 @@
|
|||
[tox]
|
||||
envlist = {py27,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
|
||||
envlist = {py36,py37}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
|
||||
|
||||
[testenv]
|
||||
commands = {envpython} setup.py test
|
||||
deps =
|
||||
{py27,py36}-postgresql: psycopg2 >= 2.5
|
||||
pypy-postgresql: psycopg2cffi >= 2.5
|
||||
mysql: MySQL-python
|
||||
sqlite: sqlitebck
|
||||
{py36,py37}-postgresql: psycopg2 >= 2.5
|
||||
pypy3-postgresql: psycopg2cffi >= 2.5
|
||||
{py36}-sqlite: sqlitebck
|
||||
setenv =
|
||||
sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
|
||||
postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
|
||||
mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
|
||||
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 {opts} {packages}
|
||||
install_command = pip install --pre {opts} {packages}
|
|
@ -1,5 +1,5 @@
|
|||
[tryton]
|
||||
version=4.8.0
|
||||
version=5.0.0
|
||||
depends:
|
||||
ir
|
||||
res
|
||||
|
|
Loading…
Reference in New Issue