Add Python3 support
issue3211 review24851003
This commit is contained in:
+2
-2
@@ -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
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
* Add Python3 support
|
||||
|
||||
Version 3.8.0 - 2015-11-02
|
||||
* Bug fixes (see mercurial logs for details)
|
||||
|
||||
|
||||
+5
-4
@@ -1,5 +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 __future__ import division
|
||||
import datetime
|
||||
from dateutil.relativedelta import relativedelta
|
||||
import itertools
|
||||
@@ -435,8 +436,8 @@ class ForecastLine(ModelSQL, ModelView):
|
||||
|
||||
delta = to_date - from_date
|
||||
delta = delta.days + 1
|
||||
nb_packet = int((self.quantity - self.quantity_executed)
|
||||
/ self.minimal_quantity)
|
||||
nb_packet = ((self.quantity - self.quantity_executed)
|
||||
// self.minimal_quantity)
|
||||
distribution = self.distribute(delta, nb_packet)
|
||||
unit_price = None
|
||||
if self.forecast.destination.type == 'customer':
|
||||
@@ -484,7 +485,7 @@ class ForecastLine(ModelSQL, ModelView):
|
||||
elif delta // qty > 1:
|
||||
i = 0
|
||||
while i < qty:
|
||||
a[i * delta // qty + (delta // qty / 2)] += 1
|
||||
a[i * delta // qty + (delta // qty // 2)] += 1
|
||||
i += 1
|
||||
qty = 0
|
||||
else:
|
||||
@@ -493,7 +494,7 @@ class ForecastLine(ModelSQL, ModelView):
|
||||
qty = delta - qty
|
||||
i = 0
|
||||
while i < qty:
|
||||
a[delta - ((i * delta // qty) + (delta // qty / 2)) - 1
|
||||
a[delta - ((i * delta // qty) + (delta // qty // 2)) - 1
|
||||
] -= 1
|
||||
i += 1
|
||||
qty = 0
|
||||
|
||||
@@ -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'):
|
||||
@@ -89,6 +95,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',
|
||||
@@ -102,4 +111,5 @@ setup(name=name,
|
||||
""",
|
||||
test_suite='tests',
|
||||
test_loader='trytond.test_loader:Loader',
|
||||
use_2to3=True,
|
||||
)
|
||||
|
||||
@@ -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 =
|
||||
|
||||
Reference in New Issue
Block a user