mirror of
https://github.com/NaN-tic/trytond-sale_salesman.git
synced 2023-12-14 02:02:54 +01:00
Update to 4.7
This commit is contained in:
parent
146bc41d96
commit
15e82c2f43
8 changed files with 73 additions and 29 deletions
56
.drone.yml
56
.drone.yml
|
@ -1,9 +1,49 @@
|
||||||
image: python:all
|
clone:
|
||||||
env:
|
hg:
|
||||||
- POSTGRESQL_URI=postgresql://postgres@127.0.0.1:5432/
|
image: plugins/hg
|
||||||
- MYSQL_URI=mysql://root@127.0.0.1:3306/
|
|
||||||
script:
|
pipeline:
|
||||||
- pip install tox
|
tox:
|
||||||
- tox -e "{py27,py33,py34,py35}-{sqlite,postgresql}" --skip-missing-interpreters
|
image: ${IMAGE}
|
||||||
|
environment:
|
||||||
|
- CFLAGS=-O0
|
||||||
|
- DB_CACHE=/cache
|
||||||
|
- TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
|
||||||
|
- POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
|
||||||
|
commands:
|
||||||
|
- pip install tox
|
||||||
|
- tox -e "${TOXENV}-${DATABASE}"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
- postgres
|
postgresql:
|
||||||
|
image: postgres
|
||||||
|
when:
|
||||||
|
matrix:
|
||||||
|
DATABASE: postgresql
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- IMAGE: python:2.7
|
||||||
|
TOXENV: py27
|
||||||
|
DATABASE: sqlite
|
||||||
|
- IMAGE: python:2.7
|
||||||
|
TOXENV: py27
|
||||||
|
DATABASE: postgresql
|
||||||
|
- IMAGE: python:3.4
|
||||||
|
TOXENV: py34
|
||||||
|
DATABASE: sqlite
|
||||||
|
- IMAGE: python:3.4
|
||||||
|
TOXENV: py34
|
||||||
|
DATABASE: postgresql
|
||||||
|
- IMAGE: python:3.5
|
||||||
|
TOXENV: py35
|
||||||
|
DATABASE: sqlite
|
||||||
|
- IMAGE: python:3.5
|
||||||
|
TOXENV: py35
|
||||||
|
DATABASE: postgresql
|
||||||
|
- IMAGE: python:3.6
|
||||||
|
TOXENV: py36
|
||||||
|
DATABASE: sqlite
|
||||||
|
- IMAGE: python:3.6
|
||||||
|
TOXENV: py36
|
||||||
|
DATABASE: postgresql
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
# The COPYRIGHT file at the top level of this repository contains
|
# The COPYRIGHT file at the top level of this repository contains
|
||||||
# the full copyright notices and license terms.
|
# the full copyright notices and license terms.
|
||||||
from trytond.pool import Pool
|
from trytond.pool import Pool
|
||||||
from .sale import *
|
from . import sale
|
||||||
|
|
||||||
|
|
||||||
def register():
|
def register():
|
||||||
Pool.register(
|
Pool.register(
|
||||||
Sale,
|
sale.Sale,
|
||||||
module='sale_salesman', type_='model')
|
module='sale_salesman', type_='model')
|
||||||
|
|
2
sale.py
2
sale.py
|
@ -35,7 +35,7 @@ class Sale:
|
||||||
|
|
||||||
super(Sale, cls).__register__(module_name)
|
super(Sale, cls).__register__(module_name)
|
||||||
|
|
||||||
#Migration from 2.8: Salesman from user to employee
|
# Migration from 2.8: Salesman from user to employee
|
||||||
if table.column_exist('salesman'):
|
if table.column_exist('salesman'):
|
||||||
cursor.execute('update "%s" set employee = "%s".employee from "%s"'
|
cursor.execute('update "%s" set employee = "%s".employee from "%s"'
|
||||||
' where "%s".id = "%s".salesman' %
|
' where "%s".id = "%s".salesman' %
|
||||||
|
|
23
setup.py
23
setup.py
|
@ -12,6 +12,8 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from ConfigParser import ConfigParser
|
from ConfigParser import ConfigParser
|
||||||
|
|
||||||
|
MODULE = 'sale_salesman'
|
||||||
|
PREFIX = 'trytonzz'
|
||||||
MODULE2PREFIX = {}
|
MODULE2PREFIX = {}
|
||||||
|
|
||||||
|
|
||||||
|
@ -20,6 +22,7 @@ def read(fname):
|
||||||
os.path.join(os.path.dirname(__file__), fname),
|
os.path.join(os.path.dirname(__file__), fname),
|
||||||
'r', encoding='utf-8').read()
|
'r', encoding='utf-8').read()
|
||||||
|
|
||||||
|
|
||||||
def get_require_version(name):
|
def get_require_version(name):
|
||||||
if minor_version % 2:
|
if minor_version % 2:
|
||||||
require = '%s >= %s.%s.dev0, < %s.%s'
|
require = '%s >= %s.%s.dev0, < %s.%s'
|
||||||
|
@ -39,8 +42,6 @@ version = info.get('version', '0.0.1')
|
||||||
major_version, minor_version, _ = version.split('.', 2)
|
major_version, minor_version, _ = version.split('.', 2)
|
||||||
major_version = int(major_version)
|
major_version = int(major_version)
|
||||||
minor_version = int(minor_version)
|
minor_version = int(minor_version)
|
||||||
name = 'trytonzz_sale_salesman'
|
|
||||||
download_url = 'https://bitbucket.org/zikzakmedia/trytond-sale_salesman'
|
|
||||||
|
|
||||||
requires = []
|
requires = []
|
||||||
for dep in info.get('depends', []):
|
for dep in info.get('depends', []):
|
||||||
|
@ -55,22 +56,22 @@ if minor_version % 2:
|
||||||
# Add development index for testing with proteus
|
# Add development index for testing with proteus
|
||||||
dependency_links.append('https://trydevpi.tryton.org/')
|
dependency_links.append('https://trydevpi.tryton.org/')
|
||||||
|
|
||||||
setup(name=name,
|
setup(name='%s_%s' % (PREFIX, MODULE),
|
||||||
version=version,
|
version=version,
|
||||||
description='Tryton Sale Salesman Module',
|
description='Tryton Sale Salesman Module',
|
||||||
long_description=read('README'),
|
long_description=read('README'),
|
||||||
author='Zikzakmedia SL',
|
author='Zikzakmedia SL',
|
||||||
author_email='zikzak@zikzakmedia.com',
|
author_email='zikzak@zikzakmedia.com',
|
||||||
url='https://bitbucket.org/zikzakmedia/',
|
url='https://bitbucket.org/zikzakmedia/',
|
||||||
download_url=download_url,
|
download_url='https://bitbucket.org/zikzakmedia/trytond-%s' % MODULE,
|
||||||
keywords='',
|
keywords='',
|
||||||
package_dir={'trytond.modules.sale_salesman': '.'},
|
package_dir={'trytond.modules.%s' % MODULE: '.'},
|
||||||
packages=[
|
packages=[
|
||||||
'trytond.modules.sale_salesman',
|
'trytond.modules.%s' % MODULE,
|
||||||
'trytond.modules.sale_salesman.tests',
|
'trytond.modules.%s.tests' % MODULE,
|
||||||
],
|
],
|
||||||
package_data={
|
package_data={
|
||||||
'trytond.modules.sale_salesman': (info.get('xml', [])
|
'trytond.modules.%s' % MODULE: (info.get('xml', [])
|
||||||
+ ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt',
|
+ ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt',
|
||||||
'icons/*.svg', 'tests/*.rst']),
|
'icons/*.svg', 'tests/*.rst']),
|
||||||
},
|
},
|
||||||
|
@ -97,9 +98,9 @@ setup(name=name,
|
||||||
'Natural Language :: Spanish',
|
'Natural Language :: Spanish',
|
||||||
'Operating System :: OS Independent',
|
'Operating System :: OS Independent',
|
||||||
'Programming Language :: Python :: 2.7',
|
'Programming Language :: Python :: 2.7',
|
||||||
'Programming Language :: Python :: 3.3',
|
|
||||||
'Programming Language :: Python :: 3.4',
|
'Programming Language :: Python :: 3.4',
|
||||||
'Programming Language :: Python :: 3.5',
|
'Programming Language :: Python :: 3.5',
|
||||||
|
'Programming Language :: Python :: 3.6',
|
||||||
'Programming Language :: Python :: Implementation :: CPython',
|
'Programming Language :: Python :: Implementation :: CPython',
|
||||||
'Programming Language :: Python :: Implementation :: PyPy',
|
'Programming Language :: Python :: Implementation :: PyPy',
|
||||||
'Topic :: Office/Business',
|
'Topic :: Office/Business',
|
||||||
|
@ -110,8 +111,8 @@ setup(name=name,
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
entry_points="""
|
entry_points="""
|
||||||
[trytond.modules]
|
[trytond.modules]
|
||||||
sale_salesman = trytond.modules.sale_salesman
|
%s = trytond.modules.%s
|
||||||
""",
|
""" % (MODULE, MODULE),
|
||||||
test_suite='tests',
|
test_suite='tests',
|
||||||
test_loader='trytond.test_loader:Loader',
|
test_loader='trytond.test_loader:Loader',
|
||||||
tests_require=tests_require,
|
tests_require=tests_require,
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
# This file is part of sale_salesman module for Tryton.
|
# This file is part of sale_salesman module for Tryton.
|
||||||
# The COPYRIGHT file at the top level of this repository contains
|
# The COPYRIGHT file at the top level of this repository contains
|
||||||
# the full copyright notices and license terms.
|
# the full copyright notices and license terms.
|
||||||
|
try:
|
||||||
from .test_sale_salesman import suite
|
from trytond.modules.sale_salesman.tests.test_sale_salesman import suite
|
||||||
|
except ImportError:
|
||||||
|
from .test_sale_salesman import suite
|
||||||
|
|
||||||
__all__ = ['suite']
|
__all__ = ['suite']
|
||||||
|
|
7
tox.ini
7
tox.ini
|
@ -1,12 +1,13 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist = {py27,py33,py34,py35}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
|
envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
commands = {envpython} setup.py test
|
commands = {envpython} setup.py test
|
||||||
deps =
|
deps =
|
||||||
{py27,py33,py34,py35}-postgresql: psycopg2 >= 2.5
|
{py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
|
||||||
pypy-postgresql: psycopg2cffi >= 2.5
|
pypy-postgresql: psycopg2cffi >= 2.5
|
||||||
mysql: MySQL-python
|
mysql: MySQL-python
|
||||||
|
sqlite: sqlitebck
|
||||||
setenv =
|
setenv =
|
||||||
sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
|
sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
|
||||||
postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
|
postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
|
||||||
|
@ -14,4 +15,4 @@ setenv =
|
||||||
sqlite: DB_NAME={env:SQLITE_NAME::memory:}
|
sqlite: DB_NAME={env:SQLITE_NAME::memory:}
|
||||||
postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
|
postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
|
||||||
mysql: DB_NAME={env:MYSQL_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}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[tryton]
|
[tryton]
|
||||||
version=4.1.0
|
version=4.7.0
|
||||||
depends:
|
depends:
|
||||||
ir
|
ir
|
||||||
res
|
res
|
||||||
|
|
Loading…
Reference in a new issue