From 1d16f5be0f06e471674d2dc0a03ff30476d3a714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 26 Jun 2018 19:11:46 +0200 Subject: [PATCH] Remove support for Python 2.7 issue7497 review53261002 --- .drone.yml | 6 ------ CHANGELOG | 2 ++ INSTALL | 2 +- carrier.py | 3 +-- sale.py | 3 +-- setup.py | 20 +++++++------------ stock.py | 6 ++---- ...percentage_with_purchase_shipment_cost.rst | 14 ++++++------- tox.ini | 6 +++--- 9 files changed, 24 insertions(+), 38 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 bb47bc1f58..40bea3ced7 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 2152713962..619e0b17aa 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Installing trytond_carrier_percentage 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_carrier (http://www.tryton.org/) * trytond_currency (http://www.tryton.org/) diff --git a/carrier.py b/carrier.py index 7d2fa2e820..8cf58a34dc 100644 --- a/carrier.py +++ b/carrier.py @@ -9,8 +9,7 @@ from trytond.pyson import Eval __all__ = ['Carrier'] -class Carrier: - __metaclass__ = PoolMeta +class Carrier(metaclass=PoolMeta): __name__ = 'carrier' percentage = fields.Numeric('Percentage', digits=(16, 8), states={ diff --git a/sale.py b/sale.py index 5d2bca9cee..ae24546707 100644 --- a/sale.py +++ b/sale.py @@ -7,8 +7,7 @@ from trytond.pool import PoolMeta __all__ = ['Sale'] -class Sale: - __metaclass__ = PoolMeta +class Sale(metaclass=PoolMeta): __name__ = 'sale.sale' def _get_carrier_context(self): diff --git a/setup.py b/setup.py index e976061cb9..16f605a2c2 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')) @@ -104,7 +102,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', @@ -113,6 +110,7 @@ setup(name=name, 'Topic :: Office/Business', ], license='GPL-3', + python_requires='>=3.4', install_requires=requires, dependency_links=dependency_links, zip_safe=False, @@ -123,8 +121,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_carrier_percentage_with_purchase_shipment_cost.rst', - ], ) diff --git a/stock.py b/stock.py index fe5befb52a..726cb772fa 100644 --- a/stock.py +++ b/stock.py @@ -28,8 +28,7 @@ def _percentage_amount(lines, company): return amount -class ShipmentIn: - __metaclass__ = PoolMeta +class ShipmentIn(metaclass=PoolMeta): __name__ = 'stock.shipment.in' def _get_carrier_context(self): @@ -46,8 +45,7 @@ class ShipmentIn: return context -class ShipmentOut: - __metaclass__ = PoolMeta +class ShipmentOut(metaclass=PoolMeta): __name__ = 'stock.shipment.out' def _get_carrier_context(self): diff --git a/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst b/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst index bfc8d131b7..91791a5d16 100644 --- a/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst +++ b/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst @@ -127,7 +127,7 @@ Receive a single product line:: True >>> shipment.click('receive') >>> shipment.state - u'received' + 'received' >>> move, = shipment.incoming_moves >>> move.unit_price Decimal('9.2000') @@ -160,7 +160,7 @@ Sale products with cost on shipment:: >>> sale.click('confirm') >>> sale.click('process') >>> sale.state - u'processing' + 'processing' >>> sale.untaxed_amount Decimal('115.00') @@ -181,16 +181,16 @@ Send products:: >>> shipment.cost_currency == company.currency True >>> shipment.state - u'waiting' + 'waiting' >>> shipment.click('assign_force') >>> shipment.state - u'assigned' + 'assigned' >>> shipment.click('pack') >>> shipment.state - u'packed' + 'packed' >>> shipment.click('done') >>> shipment.state - u'done' + 'done' Check customer invoice:: @@ -221,7 +221,7 @@ Sale products with cost on order:: >>> sale.click('confirm') >>> sale.click('process') >>> sale.state - u'processing' + 'processing' >>> sale.untaxed_amount Decimal('69.00') 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://}