Migrate to 5.0

.drone.yml

@@ -31,27 +31,15 @@ services:
 
 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
+        - IMAGE: python:3.7
+          TOXENV: py37
+          DATABASE: sqlite
+        - IMAGE: python:3.7
+          TOXENV: py37
+          DATABASE: postgresql

setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # encoding: utf-8
 
 from setuptools import setup
@@ -28,6 +28,7 @@ def read(fname):
         'r', encoding='utf-8').read()
 
 
+
 def get_require_version(name):
     if minor_version % 2:
         require = '%s >= %s.%s.dev0, < %s.%s'
@@ -37,6 +38,7 @@ def get_require_version(name):
         major_version, minor_version + 1)
     return require
 
+
 config = ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
@@ -49,17 +51,6 @@ major_version, minor_version, _ = version.split('.', 2)
 major_version = int(major_version)
 minor_version = int(minor_version)
 
-requires = []
-for dep in info.get('depends', []) + ['sale_change_quantity']:
-    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('nantic-sale_change_quantity')
-]
 
 series = '%s.%s' % (major_version, minor_version)
 if minor_version % 2:
@@ -67,21 +58,42 @@ if minor_version % 2:
 else:
     branch = series
 
-dependency_links = [
-    ('hg+https://bitbucket.org/nantic/'
+dependency_links = {
+    'production_origin':
+        'hg+https://bitbucket.org/nantic/'
         'trytond-production_origin@%(branch)s'
         '#egg=nantic-production_origin-%(series)s' % {
             'branch': branch,
             'series': series,
-            }),
-    ('hg+https://bitbucket.org/nantic/'
+            },
+    'sale_change_quantity':
+        'hg+https://bitbucket.org/nantic/'
         'trytond-sale_change_quantity@%(branch)s'
         '#egg=nantic-sale_change_quantity-%(series)s' % {
             'branch': branch,
             'series': series,
-            }),
-    ]
+            },
+    }
 
+requires = []
+for dep in info.get('depends', []) + ['sale_change_quantity']:
+    if not re.match(r'(ir|res)(\W|$)', dep):
+        prefix = MODULE2PREFIX.get(dep, 'trytond')
+        req = get_require_version('%s_%s' % (prefix, dep))
+        if dep in dependency_links:
+            req = '%s_%s @ %s' % (prefix, dep, dependency_links[dep])
+        requires.append(req)
+
+requires.append(get_require_version('trytond'))
+
+tests_require = [
+
+    get_require_version('proteus'),
+
+    get_require_version('nantic-sale_change_quantity')
+]
+
+dependency_links = list(dependency_links.values())
 if minor_version % 2:
     # Add development index for testing with proteus
     dependency_links.append('https://trydevpi.tryton.org/')
@@ -121,15 +133,16 @@ setup(name='%s_%s' % (PREFIX, MODULE),
         'Natural Language :: Russian',
         '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 :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
         ],
     license='GPL-3',
+    python_requires='>=3.4',
     install_requires=requires,
     dependency_links=dependency_links,
     zip_safe=False,
@@ -140,9 +153,4 @@ 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_supply_production.rst',
-        'tests/scenario_sale_supply_production_change_quantity.rst',
-        ],
     )

tools.py

@@ -8,18 +8,18 @@ def prepare_vals(values, to_write=False):
         if set(values.keys()) <= set(['add', 'remove']):
             res = []
             if to_write:
-                if 'add' in values.keys():
+                if 'add' in list(values.keys()):
                     res.append(('create',
                             prepare_vals([v[1] for v in values['add']])))
-                if 'remove' in values.keys():
+                if 'remove' in list(values.keys()):
                     res.append(('delete', values['remove']))
             else:
                 # to create
-                if 'add' in values.keys():
+                if 'add' in list(values.keys()):
                     res = [x for _, x in values['add']]
         else:
             res = {}
-            for key, value in values.items():
+            for key, value in list(values.items()):
                 if 'rec_name' in key or key == 'id':
                     continue
                 value = prepare_vals(value)

tox.ini

@@ -1,15 +1,15 @@
 [tox]
-envlist = {py27,py34,py35,py36}-{sqlite,postgresql},pypy-{sqlite,postgresql}
+envlist = {py36,py37}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
 
 [testenv]
 commands = {envpython} setup.py test
 deps =
-    {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
-    pypy-postgresql: psycopg2cffi >= 2.5
-    sqlite: sqlitebck
+    {py36,py37}-postgresql: psycopg2 >= 2.5
+    pypy3-postgresql: psycopg2cffi >= 2.5
+    {py36}-sqlite: sqlitebck
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
     postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
     sqlite: DB_NAME={env:SQLITE_NAME::memory:}
     postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
-install_command = pip install --pre --process-dependency-links {opts} {packages}
+install_command = pip install --pre {opts} {packages}

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=4.9.0
+version=5.0.0
 depends:
     production_origin
     sale