Update to 5.8 series
This commit is contained in:
parent
348cff1a25
commit
607f5a9a5c
|
@ -3,20 +3,20 @@ stages:
|
||||||
- build
|
- build
|
||||||
- deploy
|
- deploy
|
||||||
|
|
||||||
test:py35-sqlite:
|
test:py37-sqlite:
|
||||||
stage: test
|
stage: test
|
||||||
image: python:3.5
|
image: python:3.7
|
||||||
variables:
|
variables:
|
||||||
CFLAGS: "-O0"
|
CFLAGS: "-O0"
|
||||||
DB_CACHE: "~/cache"
|
DB_CACHE: "~/cache"
|
||||||
TOX_TESTENV_PASSENV: "CFLAGS DB_CACHE"
|
TOX_TESTENV_PASSENV: "CFLAGS DB_CACHE"
|
||||||
script:
|
script:
|
||||||
- pip install tox
|
- pip install tox
|
||||||
- tox -e py35-sqlite
|
- tox -e py37-sqlite
|
||||||
|
|
||||||
test:py35-postgresql:
|
test:py37-postgresql:
|
||||||
stage: test
|
stage: test
|
||||||
image: python:3.5
|
image: python:3.7
|
||||||
tags:
|
tags:
|
||||||
- postgres
|
- postgres
|
||||||
services:
|
services:
|
||||||
|
@ -30,4 +30,4 @@ test:py35-postgresql:
|
||||||
POSTGRESQL_URI: "postgresql://postgres:@postgres:5432/"
|
POSTGRESQL_URI: "postgresql://postgres:@postgres:5432/"
|
||||||
script:
|
script:
|
||||||
- pip install tox
|
- pip install tox
|
||||||
- tox -e py35-postgresql
|
- tox -e py37-postgresql
|
||||||
|
|
9
setup.py
9
setup.py
|
@ -41,11 +41,7 @@ name = 'kopen_web_shop_woocommerce'
|
||||||
|
|
||||||
requires = ['WooCommerce']
|
requires = ['WooCommerce']
|
||||||
for dep in info.get('depends', []):
|
for dep in info.get('depends', []):
|
||||||
if dep == 'web_shop':
|
if not re.match(r'(ir|res)(\W|$)', dep):
|
||||||
requires.append('trytond_%(dep)s @ https://gitlab.com/kopen/'
|
|
||||||
'%(dep)s/-/archive/master/%(dep)s-master.zip'
|
|
||||||
% {'dep': dep})
|
|
||||||
elif not re.match(r'(ir|res)(\W|$)', dep):
|
|
||||||
prefix = MODULE2PREFIX.get(dep, 'trytond')
|
prefix = MODULE2PREFIX.get(dep, 'trytond')
|
||||||
requires.append(get_require_version('%s_%s' % (prefix, dep)))
|
requires.append(get_require_version('%s_%s' % (prefix, dep)))
|
||||||
requires.append(get_require_version('trytond'))
|
requires.append(get_require_version('trytond'))
|
||||||
|
@ -104,7 +100,6 @@ setup(name=name,
|
||||||
'Natural Language :: Turkish',
|
'Natural Language :: Turkish',
|
||||||
'Operating System :: OS Independent',
|
'Operating System :: OS Independent',
|
||||||
'Programming Language :: Python :: 3',
|
'Programming Language :: Python :: 3',
|
||||||
'Programming Language :: Python :: 3.5',
|
|
||||||
'Programming Language :: Python :: 3.6',
|
'Programming Language :: Python :: 3.6',
|
||||||
'Programming Language :: Python :: 3.7',
|
'Programming Language :: Python :: 3.7',
|
||||||
'Programming Language :: Python :: 3.8',
|
'Programming Language :: Python :: 3.8',
|
||||||
|
@ -113,7 +108,7 @@ setup(name=name,
|
||||||
'Topic :: Office/Business',
|
'Topic :: Office/Business',
|
||||||
],
|
],
|
||||||
license='GPL-3',
|
license='GPL-3',
|
||||||
python_requires='>=3.5',
|
python_requires='>=3.6',
|
||||||
install_requires=requires,
|
install_requires=requires,
|
||||||
dependency_links=dependency_links,
|
dependency_links=dependency_links,
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
|
|
6
tox.ini
6
tox.ini
|
@ -1,12 +1,12 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist = {py35,py36,py37,py38}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
|
envlist = {py36,py37,py38}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
commands = {envpython} setup.py test
|
commands = {envpython} setup.py test
|
||||||
deps =
|
deps =
|
||||||
{py35,py36,py37,py38}-postgresql: psycopg2 >= 2.5
|
{py36,py37,py38}-postgresql: psycopg2 >= 2.5
|
||||||
pypy3-postgresql: psycopg2cffi >= 2.5
|
pypy3-postgresql: psycopg2cffi >= 2.5
|
||||||
{py35,py36}-sqlite: sqlitebck
|
py36-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://}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[tryton]
|
[tryton]
|
||||||
version=5.6.0
|
version=5.8.0
|
||||||
depends:
|
depends:
|
||||||
ir
|
ir
|
||||||
account_product
|
account_product
|
||||||
|
|
Loading…
Reference in New Issue