Add Python3 support

issue3211
This commit is contained in:
Cédric Krier committed 2016-03-10 15:08:15 +01:00
1 parent 6c93bddba9
commit 7ed7be42a4
9 files changed
+32 -11

No files matched your search

+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)
+3 -1
View File
@@ -5,10 +5,10 @@ from trytond.pyson import Eval, Bool, Get
from trytond.pool import PoolMeta
__all__ = ['Configuration', 'FiscalYear', 'AccountMove']
__metaclass__ = PoolMeta
class Configuration:
__metaclass__ = PoolMeta
__name__ = 'account.configuration'
stock_journal = fields.Property(fields.Many2One(
'account.journal', 'Stock Journal',
@@ -22,6 +22,7 @@ class Configuration:
class FiscalYear:
__metaclass__ = PoolMeta
__name__ = 'account.fiscalyear'
account_stock_method = fields.Selection([
(None, 'None'),
@@ -30,6 +31,7 @@ class FiscalYear:
class AccountMove:
__metaclass__ = PoolMeta
__name__ = 'account.move'
@classmethod
+3 -1
View File
@@ -14,10 +14,10 @@ from trytond.modules.product import price_digits, TemplateFunction
__all__ = ['Category', 'Template', 'Product', 'UpdateCostPriceAsk',
'UpdateCostPriceShowMove', 'UpdateCostPrice']
__metaclass__ = PoolMeta
class Category:
__metaclass__ = PoolMeta
__name__ = 'product.category'
account_stock = fields.Property(fields.Many2One('account.account',
'Account Stock', domain=[
@@ -87,6 +87,7 @@ class Category:
class Template:
__metaclass__ = PoolMeta
__name__ = 'product.template'
account_stock = fields.Property(fields.Many2One('account.account',
'Account Stock',
@@ -181,6 +182,7 @@ class Template:
class Product:
__metaclass__ = PoolMeta
__name__ = 'product.product'
# Avoid raise of UserError from MissingFunction
account_stock_used = fields.Function(
+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'):
@@ -97,6 +103,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',
@@ -113,4 +122,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_account_stock_continental.rst',
],
)
+1 -1
View File
@@ -7,10 +7,10 @@ from trytond.pool import Pool, PoolMeta
from trytond.transaction import Transaction
__all__ = ['Move']
__metaclass__ = PoolMeta
class Move:
__metaclass__ = PoolMeta
__name__ = 'stock.move'
def _get_account_stock_move_lines(self, type_):
+1 -1
View File
@@ -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
>>> from trytond.modules.account_stock_continental.tests.tools import \
... add_stock_accounts
+2
View File
@@ -5,6 +5,7 @@ import doctest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import ModuleTestCase
from trytond.tests.test_tryton import doctest_setup, doctest_teardown
from trytond.tests.test_tryton import doctest_checker
class AccountStockContinentalTestCase(ModuleTestCase):
@@ -19,5 +20,6 @@ def suite():
suite.addTests(doctest.DocFileSuite(
'scenario_account_stock_continental.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 =