From ef41dafd7da8a3d655a84961749e26d6685f14b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80ngel=20=C3=80lvarez?= Date: Fri, 24 Apr 2020 05:06:04 +0200 Subject: [PATCH] fix setup.py --- setup.py | 56 +++++++++++++++++++++++++++----------------------------- tox.ini | 3 +-- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/setup.py b/setup.py index d61e05e..a254e4f 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,9 @@ #!/usr/bin/env python -# This file is part account_code_digits 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#!/usr/bin/env python +# encoding: utf-8 from setuptools import setup import re @@ -42,27 +44,38 @@ 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')) +requires += [get_require_version('trytond_account')] + +tests_require = [ + get_require_version('proteus'), + + ] + +series = '%s.%s' % (major_version, minor_version) +if minor_version % 2: + branch = 'master' +else: + branch = series -tests_require = [get_require_version('proteus')] 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 Account Code Digits 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-account_code_digits', package_dir={'trytond.modules.%s' % MODULE: '.'}, packages=[ 'trytond.modules.%s' % MODULE, @@ -70,8 +83,7 @@ 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']), }, classifiers=[ 'Development Status :: 5 - Production/Stable', @@ -81,26 +93,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', @@ -114,5 +112,5 @@ setup(name='%s_%s' % (PREFIX, MODULE), test_suite='tests', test_loader='trytond.test_loader:Loader', tests_require=tests_require, - use_2to3=True, - ) + + ) \ No newline at end of file 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