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

INSTALL

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

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'))
@@ -100,7 +98,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',
@@ -109,6 +106,7 @@ setup(name=name,
         'Topic :: Office/Business',
         ],
     license='GPL-3',
+    python_requires='>=3.4',
     install_requires=requires,
     dependency_links=dependency_links,
     zip_safe=False,
@@ -119,5 +117,4 @@ setup(name=name,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
     tests_require=tests_require,
-    use_2to3=True,
     )

stock.py

@@ -16,8 +16,7 @@ __all__ = ['Move',
     'Package']
 
 
-class Move:
-    __metaclass__ = PoolMeta
+class Move(metaclass=PoolMeta):
     __name__ = 'stock.move'
 
     internal_weight = fields.Float(
@@ -201,8 +200,7 @@ class MeasurementsMixin(object):
         raise NotImplementedError
 
 
-class ShipmentIn(MeasurementsMixin, object):
-    __metaclass__ = PoolMeta
+class ShipmentIn(MeasurementsMixin, object, metaclass=PoolMeta):
     __name__ = 'stock.shipment.in'
 
     @classmethod
@@ -212,8 +210,7 @@ class ShipmentIn(MeasurementsMixin, object):
             & (location.type == 'supplier'))
 
 
-class ShipmentInReturn(MeasurementsMixin, object):
-    __metaclass__ = PoolMeta
+class ShipmentInReturn(MeasurementsMixin, object, metaclass=PoolMeta):
     __name__ = 'stock.shipment.in.return'
 
     @classmethod
@@ -221,8 +218,7 @@ class ShipmentInReturn(MeasurementsMixin, object):
         return move.from_location == location.id
 
 
-class ShipmentOut(MeasurementsMixin, object):
-    __metaclass__ = PoolMeta
+class ShipmentOut(MeasurementsMixin, object, metaclass=PoolMeta):
     __name__ = 'stock.shipment.out'
 
     @classmethod
@@ -232,8 +228,7 @@ class ShipmentOut(MeasurementsMixin, object):
             & (location.type == 'customer'))
 
 
-class ShipmentOutReturn(MeasurementsMixin, object):
-    __metaclass__ = PoolMeta
+class ShipmentOutReturn(MeasurementsMixin, object, metaclass=PoolMeta):
     __name__ = 'stock.shipment.out.return'
 
     @classmethod
@@ -245,8 +240,7 @@ class ShipmentOutReturn(MeasurementsMixin, object):
 # TODO ShipmentInternal
 
 
-class Package(MeasurementsMixin, object):
-    __metaclass__ = PoolMeta
+class Package(MeasurementsMixin, object, metaclass=PoolMeta):
     __name__ = 'stock.package'
 
     additional_weight = fields.Float(

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