Upgrade to 4.7
This commit is contained in:
parent
052e9da66e
commit
be2326754f
58
.drone.yml
58
.drone.yml
|
@ -1,9 +1,51 @@
|
||||||
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 sqlitebck
|
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}"
|
||||||
|
volumes:
|
||||||
|
- cache:/root/.cache
|
||||||
|
|
||||||
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
|
||||||
|
|
48
setup.py
48
setup.py
|
@ -12,9 +12,9 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from ConfigParser import ConfigParser
|
from ConfigParser import ConfigParser
|
||||||
|
|
||||||
MODULE2PREFIX = {
|
MODULE = 'electronic_mail'
|
||||||
'smtp': 'trytonzz',
|
PREFIX = 'trytonspain'
|
||||||
}
|
MODULE2PREFIX = {}
|
||||||
|
|
||||||
|
|
||||||
def read(fname):
|
def read(fname):
|
||||||
|
@ -42,14 +42,8 @@ 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 = 'trytonspain_electronic_mail'
|
|
||||||
download_url = 'https://bitbucket.org/trytonspain/trytond-electronic_mail'
|
|
||||||
|
|
||||||
requires = [
|
requires = []
|
||||||
'Genshi',
|
|
||||||
'Jinja2',
|
|
||||||
'emailvalid',
|
|
||||||
]
|
|
||||||
for dep in info.get('depends', []):
|
for dep in info.get('depends', []):
|
||||||
if not re.match(r'(ir|res)(\W|$)', dep):
|
if not re.match(r'(ir|res)(\W|$)', dep):
|
||||||
prefix = MODULE2PREFIX.get(dep, 'trytond')
|
prefix = MODULE2PREFIX.get(dep, 'trytond')
|
||||||
|
@ -62,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 Electronic Mail Tryton module Module',
|
description='Tryton electronic_mail Module',
|
||||||
long_description=read('README'),
|
long_description=read('README'),
|
||||||
author='TrytonSpain',
|
author='TrytonSpain',
|
||||||
author_email='info@trytonspain.com',
|
author_email='info@trytonspain.com',
|
||||||
url='https://bitbucket.org/trytonspain/',
|
url='https://bitbucket.org/trytonspain/',
|
||||||
download_url=download_url,
|
download_url="https://bitbucket.org/trytonspain/trytond-%s" % MODULE,
|
||||||
keywords='',
|
keywords='',
|
||||||
package_dir={'trytond.modules.electronic_mail': '.'},
|
package_dir={'trytond.modules.%s' % MODULE: '.'},
|
||||||
packages=[
|
packages=[
|
||||||
'trytond.modules.electronic_mail',
|
'trytond.modules.%s' % MODULE,
|
||||||
'trytond.modules.electronic_mail.tests',
|
'trytond.modules.%s.tests' % MODULE,
|
||||||
],
|
],
|
||||||
package_data={
|
package_data={
|
||||||
'trytond.modules.electronic_mail': (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']),
|
||||||
},
|
},
|
||||||
|
@ -89,14 +83,24 @@ setup(name=name,
|
||||||
'Intended Audience :: Financial and Insurance Industry',
|
'Intended Audience :: Financial and Insurance Industry',
|
||||||
'Intended Audience :: Legal Industry',
|
'Intended Audience :: Legal Industry',
|
||||||
'License :: OSI Approved :: GNU General Public License (GPL)',
|
'License :: OSI Approved :: GNU General Public License (GPL)',
|
||||||
|
'Natural Language :: Bulgarian',
|
||||||
'Natural Language :: Catalan',
|
'Natural Language :: Catalan',
|
||||||
|
'Natural Language :: Czech',
|
||||||
|
'Natural Language :: Dutch',
|
||||||
'Natural Language :: English',
|
'Natural Language :: English',
|
||||||
|
'Natural Language :: French',
|
||||||
|
'Natural Language :: German',
|
||||||
|
'Natural Language :: Hungarian',
|
||||||
|
'Natural Language :: Italian',
|
||||||
|
'Natural Language :: Portuguese (Brazilian)',
|
||||||
|
'Natural Language :: Russian',
|
||||||
|
'Natural Language :: Slovenian',
|
||||||
'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',
|
||||||
|
@ -107,11 +111,13 @@ setup(name=name,
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
entry_points="""
|
entry_points="""
|
||||||
[trytond.modules]
|
[trytond.modules]
|
||||||
electronic_mail = trytond.modules.electronic_mail
|
%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,
|
||||||
use_2to3=True,
|
use_2to3=True,
|
||||||
convert_2to3_doctests=['tests/scenario_electronic_mail.rst'],
|
convert_2to3_doctests=[
|
||||||
|
'tests/scenario_electronic_mail.rst',
|
||||||
|
],
|
||||||
)
|
)
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -1,10 +1,10 @@
|
||||||
[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
|
sqlite: sqlitebck
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[tryton]
|
[tryton]
|
||||||
version=4.3.0
|
version=4.7.0
|
||||||
depends:
|
depends:
|
||||||
ir
|
ir
|
||||||
smtp
|
smtp
|
||||||
|
|
Loading…
Reference in New Issue