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 6706ce46cd..6138607c7a 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) @@ -15,4 +17,4 @@ Version 4.0.0 - 2016-05-02 * Add Python3 support Version 3.8.0 - 2015-11-02 -* Initial release \ No newline at end of file +* Initial release diff --git a/INSTALL b/INSTALL index 91269ed19a..e419899a77 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Installing trytond_account_stock_landed_cost_weight 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_stock_landed_cost (http://www.tryton.org/) * trytond_product (http://www.tryton.org/) diff --git a/account.py b/account.py index 861d164c2b..de14a5b8b3 100644 --- a/account.py +++ b/account.py @@ -7,8 +7,7 @@ from trytond.pool import PoolMeta __all__ = ['LandedCost'] -class LandedCost: - __metaclass__ = PoolMeta +class LandedCost(metaclass=PoolMeta): __name__ = 'account.landed_cost' @classmethod diff --git a/setup.py b/setup.py index 4b475a9337..e632c20ee8 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')) @@ -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', @@ -112,6 +109,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, @@ -122,8 +120,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_weight.rst', - ], ) diff --git a/tests/scenario_account_stock_landed_cost_weight.rst b/tests/scenario_account_stock_landed_cost_weight.rst index cd887761af..cb3d08a984 100644 --- a/tests/scenario_account_stock_landed_cost_weight.rst +++ b/tests/scenario_account_stock_landed_cost_weight.rst @@ -166,10 +166,10 @@ Add landed cost:: >>> landed_cost.allocation_method = 'weight' >>> 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://}