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,5 +1,7 @@
+* Remove support for Python 2.7
+
 Version 4.8.0 - 2018-04-23
 * Bug fixes (see mercurial logs for details)
 
 Version 4.6.0 - 2017-10-30
-* Initial release
+* Initial release

INSTALL

@@ -4,7 +4,7 @@ Installing trytond_stock_location_move
 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_stock (http://www.tryton.org/)
 

product.py

@@ -8,8 +8,7 @@ from trytond.transaction import Transaction
 __all__ = ['Product']
 
 
-class Product:
-    __metaclass__ = PoolMeta
+class Product(metaclass=PoolMeta):
     __name__ = 'product.product'
 
     @classmethod

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_required='>=3.4',
     install_requires=requires,
     dependency_links=dependency_links,
     zip_safe=False,
@@ -121,10 +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_stock_location_move_empty.rst',
-        'tests/scenario_stock_location_move.rst',
-        'tests/scenario_stock_location_move_supply.rst',
-        ],
     )

stock.py

@@ -11,8 +11,7 @@ __all__ = ['Location', 'ShipmentInternal', 'ShipmentInternal_Location',
     'ShipmentOut', 'ShipmentInReturn', 'Supply']
 
 
-class Location:
-    __metaclass__ = PoolMeta
+class Location(metaclass=PoolMeta):
     __name__ = 'stock.location'
 
     movable = fields.Boolean(
@@ -85,7 +84,7 @@ class Location:
 
         def restore():
             locations = []
-            for location, parent in location_parents.iteritems():
+            for location, parent in location_parents.items():
                 location.parent = parent
                 locations.append(location)
             Location.save(locations)
@@ -107,8 +106,7 @@ def clear_location_assignation(func):
     return wrapper
 
 
-class ShipmentInternal:
-    __metaclass__ = PoolMeta
+class ShipmentInternal(metaclass=PoolMeta):
     __name__ = 'stock.shipment.internal'
 
     locations = fields.Many2Many(
@@ -251,8 +249,7 @@ def deactivate_empty_location(func):
     return wrapper
 
 
-class ShipmentOut:
-    __metaclass__ = PoolMeta
+class ShipmentOut(metaclass=PoolMeta):
     __name__ = 'stock.shipment.out'
 
     @classmethod
@@ -263,8 +260,7 @@ class ShipmentOut:
         super(ShipmentOut, cls).done(shipments)
 
 
-class ShipmentInReturn:
-    __metaclass__ = PoolMeta
+class ShipmentInReturn(metaclass=PoolMeta):
     __name__ = 'stock.shipment.in.return'
 
     @classmethod
@@ -275,8 +271,7 @@ class ShipmentInReturn:
         super(ShipmentInReturn, cls).done(shipments)
 
 
-class Supply:
-    __metaclass__ = PoolMeta
+class Supply(metaclass=PoolMeta):
     __name__ = 'stock.supply'
 
     def transition_create_(self):

tests/scenario_stock_location_move.rst

@@ -45,7 +45,7 @@ Move pallet from storage1 to storage2::
     >>> shipment.click('assign_try')
     True
     >>> shipment.state
-    u'assigned'
+    'assigned'
     >>> pallet.reload()
     >>> pallet.assigned_by == shipment
     True
@@ -54,7 +54,7 @@ Move pallet from storage1 to storage2::
 
     >>> shipment.click('done')
     >>> shipment.state
-    u'done'
+    'done'
     >>> pallet.reload()
     >>> pallet.assigned_by
     >>> pallet.parent == storage2

tests/scenario_stock_location_move_supply.rst

@@ -99,7 +99,7 @@ Only 1 product is requested::
     ...         ('id', '!=', shipment.id),
     ...         ])
     >>> shipment.state
-    u'request'
+    'request'
     >>> move, = shipment.moves
     >>> move.quantity
     1.0
@@ -108,4 +108,4 @@ Pallet did not moved::
 
     >>> pallet.reload()
     >>> pallet.parent.name
-    u'Provisioning Location'
+    'Provisioning Location'

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://}