diff --git a/.drone.yml b/.drone.yml index 9d7c769d8c..c4fd423e94 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,9 +1,9 @@ -image: python2.7 +image: python:all env: - POSTGRESQL_URI=postgresql://postgres@127.0.0.1:5432/ - MYSQL_URI=mysql://root@127.0.0.1:3306/ script: - pip install tox - - tox -e "py27-{sqlite,postgresql}" + - tox -e "{py27,py33,py34,py35}-{sqlite,postgresql}" --skip-missing-interpreters services: - postgres diff --git a/CHANGELOG b/CHANGELOG index 0b1dec6bd5..738bae2617 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Add Python3 support + Version 3.8.0 - 2015-11-02 * Bug fixes (see mercurial logs for details) diff --git a/carrier.py b/carrier.py index cb89b87904..3bee19d55a 100644 --- a/carrier.py +++ b/carrier.py @@ -7,10 +7,10 @@ from trytond.pool import Pool, PoolMeta from trytond.pyson import Eval __all__ = ['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 d2bf02f56d..85385b32c0 100644 --- a/sale.py +++ b/sale.py @@ -5,10 +5,10 @@ from decimal import Decimal from trytond.pool import PoolMeta __all__ = ['Sale'] -__metaclass__ = PoolMeta class Sale: + __metaclass__ = PoolMeta __name__ = 'sale.sale' def _get_carrier_context(self): diff --git a/setup.py b/setup.py index ceada096fa..113cda8908 100644 --- a/setup.py +++ b/setup.py @@ -5,11 +5,17 @@ from setuptools import setup import re import os -import ConfigParser +import io +try: + from configparser import ConfigParser +except ImportError: + from ConfigParser import ConfigParser def read(fname): - return open(os.path.join(os.path.dirname(__file__), fname)).read() + return io.open( + os.path.join(os.path.dirname(__file__), fname), + 'r', encoding='utf-8').read() def get_require_version(name): @@ -21,7 +27,7 @@ def get_require_version(name): major_version, minor_version + 1) return require -config = ConfigParser.ConfigParser() +config = ConfigParser() config.readfp(open('tryton.cfg')) info = dict(config.items('tryton')) for key in ('depends', 'extras_depend', 'xml'): @@ -96,6 +102,9 @@ setup(name=name, 'Natural Language :: Spanish', 'Operating System :: OS Independent', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Office/Business', @@ -111,4 +120,8 @@ 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 5618bd0b5e..fe5befb52a 100644 --- a/stock.py +++ b/stock.py @@ -6,7 +6,6 @@ from trytond.pool import Pool, PoolMeta from trytond.transaction import Transaction __all__ = ['ShipmentIn', 'ShipmentOut'] -__metaclass__ = PoolMeta def _percentage_amount(lines, company): @@ -30,6 +29,7 @@ def _percentage_amount(lines, company): class ShipmentIn: + __metaclass__ = PoolMeta __name__ = 'stock.shipment.in' def _get_carrier_context(self): @@ -47,6 +47,7 @@ class ShipmentIn: class ShipmentOut: + __metaclass__ = PoolMeta __name__ = 'stock.shipment.out' def _get_carrier_context(self): diff --git a/tests/__init__.py b/tests/__init__.py index ac2f05ee91..069e0a887d 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,6 +1,6 @@ # 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 test_carrier_percentage import suite +from .test_carrier_percentage import suite __all__ = ['suite'] diff --git a/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst b/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst index 3f13944cde..fd68a5fdd3 100644 --- a/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst +++ b/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst @@ -12,7 +12,7 @@ Imports:: ... get_company >>> from trytond.modules.account.tests.tools import create_fiscalyear, \ ... create_chart, get_accounts - >>> from.trytond.modules.account_invoice.tests.tools import \ + >>> from trytond.modules.account_invoice.tests.tools import \ ... set_fiscalyear_invoice_sequences, create_payment_term >>> today = datetime.date.today() diff --git a/tests/test_carrier_percentage.py b/tests/test_carrier_percentage.py index e5805faf5f..5fb451a366 100644 --- a/tests/test_carrier_percentage.py +++ b/tests/test_carrier_percentage.py @@ -6,6 +6,7 @@ from decimal import Decimal import trytond.tests.test_tryton from trytond.tests.test_tryton import ModuleTestCase, with_transaction from trytond.tests.test_tryton import doctest_setup, doctest_teardown +from trytond.tests.test_tryton import doctest_checker from trytond.pool import Pool from trytond.modules.currency.tests import create_currency @@ -70,5 +71,6 @@ def suite(): suite.addTests(doctest.DocFileSuite( 'scenario_carrier_percentage_with_purchase_shipment_cost.rst', setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8', + checker=doctest_checker, optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) return suite diff --git a/tox.ini b/tox.ini index e9d2876444..e2a064851d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] -envlist = py27-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql} +envlist = {py27,py33,py34,py35}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql} [testenv] commands = {envpython} setup.py test deps = - py27-postgresql: psycopg2 >= 2.0 + {py27,py33,py34,py35}-postgresql: psycopg2 >= 2.0 pypy-postgresql: psycopg2cffi >= 2.5 mysql: MySQL-python setenv =