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 4e6378df2a..7f835149a5 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 37bf421e8b..b95b896dcc 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Installing trytond_account_tax_rule_country 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_country (http://www.tryton.org/) diff --git a/account.py b/account.py index aca6adc97a..fa27a39ec6 100644 --- a/account.py +++ b/account.py @@ -7,8 +7,7 @@ from trytond.model import fields __all__ = ['TaxRuleLineTemplate', 'TaxRuleLine', 'InvoiceLine'] -class TaxRuleLineTemplate: - __metaclass__ = PoolMeta +class TaxRuleLineTemplate(metaclass=PoolMeta): __name__ = 'account.tax.rule.line.template' from_country = fields.Many2One('country.country', 'From Country', ondelete='RESTRICT') @@ -27,8 +26,7 @@ class TaxRuleLineTemplate: return value -class TaxRuleLine: - __metaclass__ = PoolMeta +class TaxRuleLine(metaclass=PoolMeta): __name__ = 'account.tax.rule.line' from_country = fields.Many2One('country.country', 'From Country', ondelete='RESTRICT') @@ -36,8 +34,7 @@ class TaxRuleLine: ondelete='RESTRICT') -class InvoiceLine: - __metaclass__ = PoolMeta +class InvoiceLine(metaclass=PoolMeta): __name__ = 'account.invoice.line' @fields.depends('origin') diff --git a/purchase.py b/purchase.py index 23c1727a16..05a2a102d0 100644 --- a/purchase.py +++ b/purchase.py @@ -8,8 +8,7 @@ from trytond.pyson import Eval __all__ = ['Purchase', 'PurchaseLine'] -class Purchase: - __metaclass__ = PoolMeta +class Purchase(metaclass=PoolMeta): __name__ = 'purchase.purchase' @classmethod @@ -21,8 +20,7 @@ class Purchase: field.depends.extend(['invoice_address']) -class PurchaseLine: - __metaclass__ = PoolMeta +class PurchaseLine(metaclass=PoolMeta): __name__ = 'purchase.line' @fields.depends('purchase', '_parent_purchase.warehouse', diff --git a/sale.py b/sale.py index 8081a6c024..8ad5c0d290 100644 --- a/sale.py +++ b/sale.py @@ -8,8 +8,7 @@ from trytond.pyson import Eval __all__ = ['Sale', 'SaleLine'] -class Sale: - __metaclass__ = PoolMeta +class Sale(metaclass=PoolMeta): __name__ = 'sale.sale' @classmethod @@ -21,8 +20,7 @@ class Sale: field.depends.extend(['shipment_address']) -class SaleLine: - __metaclass__ = PoolMeta +class SaleLine(metaclass=PoolMeta): __name__ = 'sale.line' @fields.depends('sale', '_parent_sale.warehouse', diff --git a/setup.py b/setup.py index 92054daa87..d2ac3cdad6 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')) @@ -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', @@ -110,6 +107,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, @@ -119,5 +117,4 @@ setup(name=name, """, test_suite='tests', test_loader='trytond.test_loader:Loader', - use_2to3=True, ) diff --git a/stock.py b/stock.py index 8aa02c8759..6cb7f29363 100644 --- a/stock.py +++ b/stock.py @@ -4,8 +4,7 @@ from trytond.pool import PoolMeta, Pool -class Move: - __metaclass__ = PoolMeta +class Move(metaclass=PoolMeta): __name__ = 'stock.move' def _get_tax_rule_pattern(self): 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://}