Add Python3 support

issue3211
This commit is contained in:
Cédric Krier
2016-03-11 10:13:42 +01:00
parent 920565c8cb
commit 3e43f928d0
10 changed files with 30 additions and 12 deletions
+2 -2
View File
@@ -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
+2
View File
@@ -1,3 +1,5 @@
* Add Python3 support
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
+1 -1
View File
@@ -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={
+1 -1
View File
@@ -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):
+16 -3
View File
@@ -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',
],
)
+2 -1
View File
@@ -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):
+1 -1
View File
@@ -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']
@@ -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()
+2
View File
@@ -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
+2 -2
View File
@@ -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 =