From 90ebc0d8de7394d5c0ee1d125fc753d47137a598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80ngel=20=C3=80lvarez?= Date: Sun, 3 May 2020 11:13:37 +0200 Subject: [PATCH] fix setup.py --- setup.py | 110 ++++++++++++++++++++++++++++++------------------------- tox.ini | 3 +- 2 files changed, 61 insertions(+), 52 deletions(-) diff --git a/setup.py b/setup.py index 829cf2f..37de446 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,5 @@ #!/usr/bin/env python -# This file is part sale_payment_type module for Tryton. -# The COPYRIGHT file at the top level of this repository contains -# the full copyright notices and license terms. +# encoding: utf-8 from setuptools import setup import re @@ -11,9 +9,13 @@ from configparser import ConfigParser MODULE = 'sale_payment_type' PREFIX = 'trytonspain' -MODULE2PREFIX = { - 'account_payment_type': 'trytonspain', - } +MODULE2PREFIX = {'account_payment_type': 'trytonspain', + 'account_bank': 'trytonspain', + 'company_bank': 'trytonspain'} +OWNER = { + 'nantic':'NaN-tic', + 'trytonzz':'nanticzz', +} def read(fname): @@ -31,53 +33,76 @@ def get_require_version(name): major_version, minor_version + 1) return require +def get_requires(depends='depends'): + requires = [] + for dep in info.get(depends, []): + if not re.match(r'(ir|res)(\W|$)', dep): + prefix = MODULE2PREFIX.get(dep, 'trytond') + owner = OWNER.get(prefix, prefix) + if prefix == 'trytond': + requires.append(get_require_version('%s_%s' % (prefix, dep))) + else: + requires.append( + '%(prefix)s-%(dep)s@git+https://github.com/%(owner)s/' + 'trytond-%(dep)s.git@%(branch)s' + '#egg=%(prefix)s-%(dep)s-%(series)s'%{ + 'prefix': prefix, + 'owner': owner, + 'dep':dep, + 'branch': branch, + 'series': series,}) + + return requires + config = ConfigParser() config.readfp(open('tryton.cfg')) info = dict(config.items('tryton')) for key in ('depends', 'extras_depend', 'xml'): if key in info: info[key] = info[key].strip().splitlines() + version = info.get('version', '0.0.1') major_version, minor_version, _ = version.split('.', 2) major_version = int(major_version) minor_version = int(minor_version) requires = [] -for dep in info.get('depends', []): - if not re.match(r'(ir|res)(\W|$)', dep): - prefix = MODULE2PREFIX.get(dep, 'trytond') - requires.append(get_require_version('%s_%s' % (prefix, dep))) -requires.append(get_require_version('trytond')) -tests_require = [get_require_version('proteus'), - get_require_version('trytond_sale_invoice_grouping'), - ] series = '%s.%s' % (major_version, minor_version) if minor_version % 2: - branch = 'default' + branch = 'master' else: branch = series -dependency_links = [ - ('hg+https://bitbucket.org/trytonspain/' - 'trytond-account_payment_type@%(branch)s' - '#egg=trytonspain-account_payment_type-%(series)s' % { - 'branch': branch, - 'series': series, - }), + +requires += get_requires('depends') + +tests_require = [ + get_require_version('proteus'), + ] +tests_require += get_requires('extras_depend') +tests_require += [ + ('trytonspain-company_bank@git+https://github.com/trytonspain/' + 'trytond-company_bank.git@%(branch)s' + '#egg=trytonspain-company_bank-%(series)s'%{ + 'branch': branch, + 'series': series,}), +] +requires += [get_require_version('trytond_sale')] + +dependency_links = [] + if minor_version % 2: # Add development index for testing with proteus dependency_links.append('https://trydevpi.tryton.org/') setup(name='%s_%s' % (PREFIX, MODULE), version=version, - description='Tryton sale_payment_type Module', + description='', long_description=read('README'), - author='TrytonSpain', - author_email='info@trytonspain.com', - url='https://bitbucket.org/trytonspain/', - download_url="https://bitbucket.org/trytonspain/trytond-%s" % MODULE, - keywords='', + author='trytonspain', + url='http://www.nan-tic.com/', + download_url='https://github.com:trytonspain/trytond-sale_payment_type', package_dir={'trytond.modules.%s' % MODULE: '.'}, packages=[ 'trytond.modules.%s' % MODULE, @@ -85,9 +110,12 @@ setup(name='%s_%s' % (PREFIX, MODULE), ], package_data={ 'trytond.modules.%s' % MODULE: (info.get('xml', []) - + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt', - 'icons/*.svg', 'tests/*.rst']), + + ['tryton.cfg', 'locale/*.po', 'tests/*.rst', 'view/*.xml', + 'icons/*.svg']), }, + project_urls = { + "Source Code": 'https://github.com:trytonspain/trytond-sale_payment_type' + }, classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: Plugins', @@ -96,26 +124,12 @@ setup(name='%s_%s' % (PREFIX, MODULE), 'Intended Audience :: Financial and Insurance Industry', 'Intended Audience :: Legal Industry', 'License :: OSI Approved :: GNU General Public License (GPL)', - 'Natural Language :: Bulgarian', 'Natural Language :: Catalan', - 'Natural Language :: Czech', - 'Natural Language :: Dutch', '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', '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 :: Implementation :: CPython', - 'Programming Language :: Python :: Implementation :: PyPy', + 'Programming Language :: Python :: 3.7', 'Topic :: Office/Business', ], license='GPL-3', @@ -129,9 +143,5 @@ setup(name='%s_%s' % (PREFIX, MODULE), test_suite='tests', test_loader='trytond.test_loader:Loader', tests_require=tests_require, - use_2to3=True, - convert_2to3_doctests=[ - 'tests/scenario_sale_payment_type.rst', - 'tests/scenario_sale_payment_type_grouping.rst', - ], + ) diff --git a/tox.ini b/tox.ini index 9548776..b321783 100644 --- a/tox.ini +++ b/tox.ini @@ -15,5 +15,4 @@ install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {o [testenv:stats] basepython=python3.7 commands = - coverage report --omit=.tox/* - coverage xml + coverage xml --omit=.tox/*,.eggs/* \ No newline at end of file