Remove support for Python 2.7

issue7497
review53261002

.drone.yml

@@ -25,12 +25,6 @@ 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

CHANGELOG

@@ -1,3 +1,4 @@
+* Remove support for Python 2.7
 * Set output cost in done transition
 
 Version 4.8.0 - 2018-04-23

INSTALL

@@ -4,7 +4,7 @@ Installing trytond_production
 Prerequisites
 -------------
 
- * Python 2.7 or later (http://www.python.org/)
+ * Python 3.4 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
  * trytond_product (http://www.tryton.org/)
  * trytond_company (http://www.tryton.org/)

product.py

@@ -8,8 +8,7 @@ from trytond.pool import PoolMeta
 __all__ = ['Template', 'Product', 'ProductBom', 'ProductionLeadTime']
 
 
-class Template:
-    __metaclass__ = PoolMeta
+class Template(metaclass=PoolMeta):
     __name__ = 'product.template'
     producible = fields.Boolean(
         "Producible", states={
@@ -19,8 +18,7 @@ class Template:
         depends=['active', 'type'])
 
 
-class Product:
-    __metaclass__ = PoolMeta
+class Product(metaclass=PoolMeta):
     __name__ = 'product.product'
 
     boms = fields.One2Many('product.product-production.bom', 'product',

setup.py

@@ -1,15 +1,12 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 
-from setuptools import setup
-import re
-import os
 import io
-try:
-    from configparser import ConfigParser
-except ImportError:
-    from ConfigParser import ConfigParser
+import os
+import re
+from configparser import ConfigParser
+from setuptools import setup
 
 
 def read(fname):
@@ -27,6 +24,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'))
@@ -102,7 +100,6 @@ setup(name=name,
         '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',
@@ -111,6 +108,7 @@ setup(name=name,
         'Topic :: Office/Business',
         ],
     license='GPL-3',
+    python_requires='>=3.4',
     install_requires=requires,
     dependency_links=dependency_links,
     zip_safe=False,
@@ -121,9 +119,4 @@ setup(name=name,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
     tests_require=tests_require,
-    use_2to3=True,
-    convert_2to3_doctests=[
-        'tests/scenario_production.rst',
-        'tests/scenario_production_rounding.rst',
-        ],
     )

stock.py

@@ -8,8 +8,7 @@ from trytond.pool import PoolMeta
 __all__ = ['Location', 'Move']
 
 
-class Location:
-    __metaclass__ = PoolMeta
+class Location(metaclass=PoolMeta):
     __name__ = 'stock.location'
     production_location = fields.Many2One('stock.location', 'Production',
         states={
@@ -23,8 +22,7 @@ class Location:
         depends=['type', 'active'])
 
 
-class Move:
-    __metaclass__ = PoolMeta
+class Move(metaclass=PoolMeta):
     __name__ = 'stock.move'
     production_input = fields.Many2One('production', 'Production Input',
         readonly=True, select=True, ondelete='CASCADE',

tests/scenario_production.rst

@@ -120,7 +120,7 @@ Create an Inventory::
     >>> inventory_line2.quantity = 6
     >>> inventory.click('confirm')
     >>> inventory.state
-    u'done'
+    'done'
 
 Make a production::
 
@@ -142,7 +142,7 @@ Make a production::
     Decimal('25.0000')
     >>> production.click('wait')
     >>> production.state
-    u'waiting'
+    'waiting'
 
 Test reset bom button::
 
@@ -169,7 +169,7 @@ Do the production::
     >>> production.click('done')
     >>> output, = production.outputs
     >>> output.state
-    u'done'
+    'done'
     >>> output.effective_date == production.effective_date
     True
     >>> with config.set_context(locations=[storage.id]):

tox.ini

@@ -1,11 +1,11 @@
 [tox]
-envlist = {py27,py34,py35,py36}-{sqlite,postgresql},pypy-{sqlite,postgresql}
+envlist = {py34,py35,py36}-{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
+    {py34,py35,py36}-postgresql: psycopg2 >= 2.5
+    pypy3-postgresql: psycopg2cffi >= 2.5
     sqlite: sqlitebck
 setenv =
     sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}