From af0f044dd68dcb6c379d8c0e9bf8ea8ba75601a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Jun 2018 19:11:44 +0200 Subject: [PATCH] Remove support for Python 2.7 issue7497 review53261002 --- .drone.yml | 6 ------ CHANGELOG | 2 ++ INSTALL | 2 +- account.py | 6 ++---- product.py | 6 ++---- setup.py | 20 +++++++------------- stock.py | 3 +-- tests/scenario_account_stock_landed_cost.rst | 4 ++-- tox.ini | 6 +++--- 9 files changed, 20 insertions(+), 35 deletions(-) diff --git a/.drone.yml b/.drone.yml index e0bc2f7026..5da6083eb7 100644 --- a/.drone.yml +++ b/.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 diff --git a/CHANGELOG b/CHANGELOG index 6672def343..ec7adec05e 100644 --- a/CHANGELOG +++ b/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) diff --git a/INSTALL b/INSTALL index fc115fdd08..ec53a4e1ac 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Installing trytond_account_stock_landed_cost 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_account (http://www.tryton.org/) * trytond_product (http://www.tryton.org/) diff --git a/account.py b/account.py index d3f481daa9..420f44ebe9 100644 --- a/account.py +++ b/account.py @@ -15,9 +15,8 @@ __all__ = ['Configuration', 'ConfigurationLandedCostSequence', 'LandedCost', 'LandedCost_Shipment', 'InvoiceLine'] -class Configuration: +class Configuration(metaclass=PoolMeta): __name__ = 'account.configuration' - __metaclass__ = PoolMeta landed_cost_sequence = fields.MultiValue(fields.Many2One( 'ir.sequence', "Landed Cost Sequence", required=True, domain=[ @@ -315,9 +314,8 @@ class LandedCost_Shipment(ModelSQL): required=True) -class InvoiceLine: +class InvoiceLine(metaclass=PoolMeta): __name__ = 'account.invoice.line' - __metaclass__ = PoolMeta landed_cost = fields.Many2One('account.landed_cost', 'Landed Cost', readonly=True, select=True, states={ diff --git a/product.py b/product.py index c335ca7121..a2e05358bb 100644 --- a/product.py +++ b/product.py @@ -8,8 +8,7 @@ from trytond.pyson import Eval __all__ = ['Template', 'Product'] -class Template: - __metaclass__ = PoolMeta +class Template(metaclass=PoolMeta): __name__ = 'product.template' landed_cost = fields.Boolean('Landed Cost', states={ 'readonly': ~Eval('active', True), @@ -17,6 +16,5 @@ class Template: }, depends=['active', 'type']) -class Product: - __metaclass__ = PoolMeta +class Product(metaclass=PoolMeta): __name__ = 'product.product' diff --git a/setup.py b/setup.py index b82e27afe1..e23cdd046b 100644 --- a/setup.py +++ b/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')) @@ -101,7 +99,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 :: Financial :: Accounting', ], license='GPL-3', + python_requires='>=3.4', install_requires=requires, dependency_links=dependency_links, zip_safe=False, @@ -121,8 +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_account_stock_landed_cost.rst', - ], ) diff --git a/stock.py b/stock.py index 9682ac7a1a..b813264e89 100644 --- a/stock.py +++ b/stock.py @@ -8,8 +8,7 @@ from trytond.modules.product import price_digits __all__ = ['Move'] -class Move: +class Move(metaclass=PoolMeta): __name__ = 'stock.move' - __metaclass__ = PoolMeta unit_landed_cost = fields.Numeric('Unit Landed Cost', digits=price_digits, readonly=True) diff --git a/tests/scenario_account_stock_landed_cost.rst b/tests/scenario_account_stock_landed_cost.rst index 0b69269774..c598787eb3 100644 --- a/tests/scenario_account_stock_landed_cost.rst +++ b/tests/scenario_account_stock_landed_cost.rst @@ -151,10 +151,10 @@ Add landed cost:: >>> landed_cost.allocation_method = 'value' >>> landed_cost.save() >>> landed_cost.state - u'draft' + 'draft' >>> landed_cost.click('post') >>> landed_cost.state - u'posted' + 'posted' Check move unit price is 101:: diff --git a/tox.ini b/tox.ini index 2082ab4f4d..adbcbf8431 100644 --- a/tox.ini +++ b/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://}