fix setup.py, scenario still fails

setup.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
-# This file is part sale_payment module for Tryton.
+# encoding: utf-8
-# The COPYRIGHT file at the top level of this repository contains
-# the full copyright notices and license terms.
 
 from setuptools import setup
 import re
@@ -9,7 +7,13 @@ import os
 import io
 from configparser import ConfigParser
 
-MODULE2PREFIX = {}
+MODULE = 'sale_payment'
+PREFIX = 'trytonspain'
+MODULE2PREFIX = {'sale_shop': 'trytonzz'}
+OWNER = {
+    'nantic':'NaN-tic',
+    'trytonzz':'nanticzz',
+}
 
 
 def read(fname):
@@ -17,6 +21,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'
@@ -26,51 +31,82 @@ 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)
-name = 'trytonspain_sale_payment'
-download_url = 'https://bitbucket.org/trytonspain/trytond-sale_payment'
 
 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')]
+series = '%s.%s' % (major_version, minor_version)
+if minor_version % 2:
+    branch = 'master'
+else:
+    branch = series
+
+requires += get_requires('depends')
+
+tests_require = [
+    get_require_version('proteus'),
+    
+    ]
+tests_require += get_requires('extras_depend')
+requires += [get_require_version('trytond_account_statement')]
+
 dependency_links = []
+
 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 Sale Payment Module',
+    description='',
     long_description=read('README'),
-    author='TrytonSpain',
+    author='trytonspain',
-    author_email='',
+    url='http://www.nan-tic.com/',
-    url='https://bitbucket.org/trytonspain/',
+    download_url='https://github.com:trytonspain/trytond-sale_payment',
-    download_url=download_url,
+    package_dir={'trytond.modules.%s' % MODULE: '.'},
-    keywords='',
-    package_dir={'trytond.modules.sale_payment': '.'},
     packages=[
-        'trytond.modules.sale_payment',
+        'trytond.modules.%s' % MODULE,
-        'trytond.modules.sale_payment.tests',
+        'trytond.modules.%s.tests' % MODULE,
         ],
     package_data={
-        'trytond.modules.sale_payment': (info.get('xml', [])
+        'trytond.modules.%s' % MODULE: (info.get('xml', [])
-            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt',
+            + ['tryton.cfg', 'locale/*.po', 'tests/*.rst', 'view/*.xml',
-                'icons/*.svg', 'tests/*.rst']),
+            'icons/*.svg']),
         },
+    project_urls = {
+       "Source Code": 'https://github.com:trytonspain/trytond-sale_payment'
+    },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
@@ -79,26 +115,12 @@ setup(name=name,
         '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.6',
-        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
         ],
     license='GPL-3',
@@ -107,11 +129,10 @@ setup(name=name,
     zip_safe=False,
     entry_points="""
     [trytond.modules]
-    sale_payment = trytond.modules.sale_payment
+    %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_sale_payment.rst'],
+    )
-    )

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 --omit=.tox/*,.eggs/* 
-    coverage xml