Migration to 5.0

.drone.yml

@@ -32,15 +32,15 @@ services:
 
 matrix:
     include:
-        - IMAGE: python:2.7
-          TOXENV: py27
-          DATABASE: sqlite
-        - IMAGE: python:2.7
-          TOXENV: py27
-          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 datalife_timesheet_work_category
 Prerequisites
 -------------
 
- * Python 2.7 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
 
 Installation

category.py

@@ -51,7 +51,7 @@ class Category(DeactivableMixin, ModelSQL, ModelView):
 
     @classmethod
     def search_rec_name(cls, name, clause):
-        if isinstance(clause[2], basestring):
+        if isinstance(clause[2], str):
             values = clause[2].split(SEPARATOR)
             values.reverse()
             domain = []

setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # The COPYRIGHT file at the top level of this repository contains
 # the full copyright notices and license terms.
 
@@ -6,10 +6,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 = {
     'timesheet_work_notebook': 'datalife'
@@ -22,6 +19,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'
@@ -32,6 +30,7 @@ def get_require_version(name):
     return require
 
 
+
 config = ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
@@ -64,12 +63,15 @@ requires = []
 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())
@@ -93,7 +95,7 @@ setup(name=name,
         ],
     package_data={
         'trytond.modules.timesheet_work_category': (info.get('xml', [])
-            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt',
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',
                 'icons/*.svg', 'tests/*.rst']),
         },
     classifiers=[
@@ -118,15 +120,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,
@@ -137,5 +140,4 @@ setup(name=name,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
     tests_require=tests_require,
-    use_2to3=True,
     )

timesheet.py

@@ -7,8 +7,7 @@ from trytond.transaction import Transaction
 __all__ = ['Work', 'WorkCategory']
 
 
-class Work:
-    __metaclass__ = PoolMeta
+class Work(metaclass=PoolMeta):
     __name__ = 'timesheet.work'
 
     categories = fields.Many2Many('timesheet.work-work.category',

tox.ini

@@ -1,18 +1,15 @@
 [tox]
-envlist = {py27,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+envlist = {py36,py37}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
 
 [testenv]
 commands = {envpython} setup.py test
 deps =
-    {py27,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 {opts} {packages}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=4.8.0
+version=5.0
 depends:
     timesheet
     timesheet_work_notebook