From e377c1813cb5c82089579c9cec531e9b41d3fb66 Mon Sep 17 00:00:00 2001 From: ?ngel ?lvarez Date: Fri, 13 Sep 2019 11:00:01 +0200 Subject: [PATCH] fix tox and setup --- setup.py | 54 +++++++++++++++++++++++++++++++----------------------- tox.ini | 10 ++++------ tryton.cfg | 2 +- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/setup.py b/setup.py index a658a9a..e1f9c0f 100644 --- a/setup.py +++ b/setup.py @@ -7,12 +7,12 @@ from setuptools import setup import re import os import io -try: - from configparser import ConfigParser -except ImportError: - from ConfigParser import ConfigParser +from configparser import ConfigParser -MODULE2PREFIX = {} +MODULE = 'carrier_zip' +PREFIX = 'trytonzz' +MODULE2PREFIX = { +} def read(fname): @@ -20,6 +20,7 @@ def read(fname): os.path.join(os.path.dirname(__file__), fname), 'r', encoding='utf-8').read() + def get_require_version(name): if minor_version % 2: require = '%s >= %s.%s.dev0, < %s.%s' @@ -39,8 +40,6 @@ version = info.get('version', '0.0.1') major_version, minor_version, _ = version.split('.', 2) major_version = int(major_version) minor_version = int(minor_version) -name = 'trytonzz_carrier_zip' -download_url = 'https://bitbucket.org/zikzakmedia/trytond-carrier_zip' requires = [] for dep in info.get('depends', []): @@ -49,28 +48,40 @@ for dep in info.get('depends', []): requires.append(get_require_version('%s_%s' % (prefix, dep))) requires.append(get_require_version('trytond')) -tests_require = [] -dependency_links = [get_require_version('proteus')] +tests_require = [get_require_version('proteus')] +series = '%s.%s' % (major_version, minor_version) +if minor_version % 2: + branch = 'default' +else: + branch = series +dependency_links = [ + # ('hg+https://bitbucket.org/zikzakmedia/' + # 'trytond-account_payment_gateway@%(branch)s' + # '#egg=trytonzz-account_payment_gateway-%(series)s' % { + # 'branch': branch, + # 'series': series, + # }), + ] if minor_version % 2: # Add development index for testing with proteus dependency_links.append('https://trydevpi.tryton.org/') -setup(name=name, +setup(name='%s_%s' % (PREFIX, MODULE), version=version, - description='Tryton Carrier Zip Module', + description='Tryton Account Payment Gateway Invoice Module', long_description=read('README'), author='Zikzakmedia SL', author_email='zikzak@zikzakmedia.com', url='https://bitbucket.org/zikzakmedia/', - download_url=download_url, + download_url='https://bitbucket.org/zikzakmedia/trytond-%s' % MODULE, keywords='', - package_dir={'trytond.modules.carrier_zip': '.'}, + package_dir={'trytond.modules.%s' % MODULE: '.'}, packages=[ - 'trytond.modules.carrier_zip', - 'trytond.modules.carrier_zip.tests', + 'trytond.modules.%s' % MODULE, + 'trytond.modules.%s.tests' % MODULE, ], package_data={ - 'trytond.modules.carrier_zip': (info.get('xml', []) + 'trytond.modules.%s' % MODULE: (info.get('xml', []) + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt', 'icons/*.svg', 'tests/*.rst']), }, @@ -97,9 +108,9 @@ setup(name=name, 'Natural Language :: Spanish', 'Operating System :: OS Independent', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Office/Business', @@ -107,16 +118,13 @@ setup(name=name, license='GPL-3', install_requires=requires, dependency_links=dependency_links, + python_requires='>=3.5', zip_safe=False, entry_points=""" [trytond.modules] - carrier_zip = trytond.modules.carrier_zip - """, + %s = trytond.modules.%s + """ % (MODULE, MODULE), test_suite='tests', test_loader='trytond.test_loader:Loader', tests_require=tests_require, - use_2to3=True, - convert_2to3_doctests=[ - 'tests/scenario_carrier_zip.rst', - ], ) diff --git a/tox.ini b/tox.ini index 3dda9ab..a7b706b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,17 +1,15 @@ [tox] -envlist = {py27,py33,py34,py35}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql} +envlist = {py35,py36,py37}-{sqlite,postgresql},pypy3-{sqlite,postgresql} [testenv] commands = {envpython} setup.py test deps = - {py27,py33,py34,py35}-postgresql: psycopg2 >= 2.5 - pypy-postgresql: psycopg2cffi >= 2.5 - mysql: MySQL-python + {py35,py36,py37}-postgresql: psycopg2 >= 2.5 + pypy3-postgresql: psycopg2cffi >= 2.5 + {py35,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 --find-links https://trydevpi.tryton.org/ {opts} {packages} diff --git a/tryton.cfg b/tryton.cfg index dacaeb7..43bef51 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=4.8.0 +version=5.2.0 depends: carrier sale_shipment_cost