Migration 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

INSTALL

@@ -4,7 +4,6 @@ Installing trytond-electronic_mail_filter
 Prerequisites
 -------------
 
- * Python 2.7 (http://www.python.org/)
  * trytond (http://www.tryton.org/)
 
 Installation

electronic_mail.py

@@ -138,7 +138,7 @@ class ElectronicMailFilter(DeactivableMixin, ModelSQL, ModelView):
         domain = self.profile.get_domain()
         try:
             records = Model.search(domain)
-        except (SyntaxError, NameError, IndexError, AttributeError), exc:
+        except (SyntaxError, NameError, IndexError, AttributeError) as exc:
             self.raise_user_error('filter_error', exc)
         return records
 
@@ -189,8 +189,7 @@ class ElectronicMailFilter(DeactivableMixin, ModelSQL, ModelView):
         ElectronicMail.send_mail(emails)
 
 
-class SearchingStart:
-    __metaclass__ = PoolMeta
+class SearchingStart(metaclass=PoolMeta):
     __name__ = 'searching.start'
 
     @staticmethod

setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # This file is part electronic_mail_filter module for Tryton.
 # The COPYRIGHT file at the top level of this repository contains
 # the full copyright notices and license terms.
@@ -7,10 +7,7 @@ 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 = {
     'electronic_mail_template': 'trytonzz',
@@ -47,35 +44,43 @@ minor_version = int(minor_version)
 name = 'trytonzz_electronic_mail_filter'
 download_url = 'https://bitbucket.org/datalife_sco/trytond-electronic_mail_filter'
 
-requires = ['emailvalid']
-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 = []
 series = '%s.%s' % (major_version, minor_version)
 if minor_version % 2:
     branch = 'default'
 else:
     branch = series
-dependency_links = [
-    ('hg+https://bitbucket.org/nantic/'
+dependency_links = {
+    'electronic_mail_template':
+        'hg+https://bitbucket.org/nantic/'
         'trytond-electronic_mail_template@%(branch)s'
         '#egg=trytonzz_electronic_mail_template-%(series)s' % {
             'branch': branch,
             'series': series,
-            }),
-    ('hg+https://bitbucket.org/datalife_sco/'
+            },
+    'searching':
+        'hg+https://bitbucket.org/datalife_sco/'
         'trytond-searching@%(branch)s'
         '#egg=trytonzz_searching-%(series)s' % {
             'branch': branch,
             'series': series,
-            })
-]
+            }
+}
+requires = ['emailvalid']
+for dep in info.get('depends', []):
+    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')]
+
+dependency_links = list(dependency_links.values())
 if minor_version % 2:
-    # Add development index for testing with proteus
     dependency_links.append('https://trydevpi.tryton.org/')
 
 setup(name=name,
@@ -94,7 +99,7 @@ setup(name=name,
         ],
     package_data={
         'trytond.modules.electronic_mail_filter': (info.get('xml', [])
-            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt',
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',
                 'icons/*.svg', 'tests/*.rst']),
         },
     classifiers=[
@@ -119,15 +124,16 @@ setup(name=name,
         'Natural Language :: Slovenian',
         '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 :: 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,
@@ -138,5 +144,4 @@ setup(name=name,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
     tests_require=tests_require,
-    use_2to3=True,
     )

template.py

@@ -13,8 +13,7 @@ from trytond.pool import PoolMeta, Pool
 __all__ = ['Template']
 
 
-class Template:
-    __metaclass__ = PoolMeta
+class Template(metaclass=PoolMeta):
     __name__ = 'electronic.mail.template'
 
     filters = fields.One2Many('electronic.mail.filter', 'template',

tox.ini

@@ -1,18 +1,15 @@
 [tox]
-envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},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
-    mysql: MySQL-python
-    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://}
-    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 --process-dependency-links {opts} {packages}
+install_command = pip install --pre {opts} {packages}

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=4.8.0
+version=5.0.0
 depends:
     ir
     res