[tryton-debian-vcs] tryton-modules-sale-price-list branch upstream updated. upstream/3.8.0-1-g87e458d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:26:21 UTC 2016
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-price-list.git;a=commitdiff;h=upstream/3.8.0-1-g87e458d
commit 87e458d44c44db9e30004813166139531bbebf3d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:16 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index cb809bb..0956a7f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Add Python3 support
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 718e584..6f27a5e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2015 Cédric Krier.
+Copyright (C) 2009-2016 Cédric Krier.
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2015 B2CK SPRL.
+Copyright (C) 2009-2016 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 7b330b8..cd78ea4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_price_list
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add price list on sale
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_sale_price_list
=======================
@@ -53,6 +53,8 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -66,6 +68,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
new file mode 100644
index 0000000..1456ca5
--- /dev/null
+++ b/locale/lo_LA.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:party.party,sale_price_list:"
+msgid "Sale Price List"
+msgstr ""
+
+msgctxt "field:sale.sale,price_list:"
+msgid "Price List"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
new file mode 100644
index 0000000..1456ca5
--- /dev/null
+++ b/locale/zh_CN.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:party.party,sale_price_list:"
+msgid "Sale Price List"
+msgstr ""
+
+msgctxt "field:sale.sale,price_list:"
+msgid "Price List"
+msgstr ""
diff --git a/party.py b/party.py
index 1e0bd74..6c59a88 100644
--- a/party.py
+++ b/party.py
@@ -5,10 +5,10 @@ from trytond.pyson import Eval
from trytond.pool import PoolMeta
__all__ = ['Party']
-__metaclass__ = PoolMeta
class Party:
+ __metaclass__ = PoolMeta
__name__ = 'party.party'
sale_price_list = fields.Property(fields.Many2One('product.price_list',
'Sale Price List',
diff --git a/product.py b/product.py
index 9388ae7..8abab5d 100644
--- a/product.py
+++ b/product.py
@@ -4,10 +4,10 @@ from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
__all__ = ['Product']
-__metaclass__ = PoolMeta
class Product:
+ __metaclass__ = PoolMeta
__name__ = 'product.product'
@classmethod
diff --git a/sale.py b/sale.py
index 3b87ebe..5e473b4 100644
--- a/sale.py
+++ b/sale.py
@@ -5,10 +5,10 @@ from trytond.pyson import Eval, Not, Equal, Or, Bool
from trytond.pool import PoolMeta
__all__ = ['Sale', 'SaleLine']
-__metaclass__ = PoolMeta
class Sale:
+ __metaclass__ = PoolMeta
__name__ = 'sale.sale'
price_list = fields.Many2One('product.price_list', 'Price List',
domain=[('company', '=', Eval('company'))],
@@ -36,6 +36,7 @@ class Sale:
class SaleLine:
+ __metaclass__ = PoolMeta
__name__ = 'sale.line'
@classmethod
diff --git a/setup.py b/setup.py
index 02c4975..11b221a 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'):
@@ -43,7 +49,7 @@ if minor_version % 2:
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
tests_require = [get_require_version('proteus')]
@@ -68,7 +74,7 @@ setup(name=name,
],
package_data={
'trytond.modules.sale_price_list': (info.get('xml', [])
- + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -79,6 +85,8 @@ setup(name=name,
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
@@ -92,6 +100,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',
@@ -108,4 +119,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_sale_price_list.rst',
+ ],
)
diff --git a/tests/__init__.py b/tests/__init__.py
index e386bd4..d554a0b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,9 @@
# 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_sale_price_list import suite
+try:
+ from trytond.modules.sale_price_list.tests.test_sale_price_list import suite
+except ImportError:
+ from .test_sale_price_list import suite
__all__ = ['suite']
diff --git a/tests/test_sale_price_list.py b/tests/test_sale_price_list.py
index 8b0369a..9652ce8 100644
--- a/tests/test_sale_price_list.py
+++ b/tests/test_sale_price_list.py
@@ -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 SalePriceListTestCase(ModuleTestCase):
@@ -18,5 +19,6 @@ def suite():
SalePriceListTestCase))
suite.addTests(doctest.DocFileSuite('scenario_sale_price_list.rst',
setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 22157d6..4d020d8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
ir
party
diff --git a/trytond_sale_price_list.egg-info/PKG-INFO b/trytond_sale_price_list.egg-info/PKG-INFO
index a484f14..1aba43e 100644
--- a/trytond_sale_price_list.egg-info/PKG-INFO
+++ b/trytond_sale_price_list.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-price-list
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add price list on sale
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_sale_price_list
=======================
@@ -53,6 +53,8 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -66,6 +68,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_sale_price_list.egg-info/SOURCES.txt b/trytond_sale_price_list.egg-info/SOURCES.txt
index 32737a7..3d3b2fd 100644
--- a/trytond_sale_price_list.egg-info/SOURCES.txt
+++ b/trytond_sale_price_list.egg-info/SOURCES.txt
@@ -50,11 +50,13 @@ locale/fr_FR.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
+locale/lo_LA.po
locale/lt_LT.po
locale/nl_NL.po
locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
+locale/zh_CN.po
trytond_sale_price_list.egg-info/PKG-INFO
trytond_sale_price_list.egg-info/SOURCES.txt
trytond_sale_price_list.egg-info/dependency_links.txt
diff --git a/trytond_sale_price_list.egg-info/requires.txt b/trytond_sale_price_list.egg-info/requires.txt
index 769b348..6c2bae2 100644
--- a/trytond_sale_price_list.egg-info/requires.txt
+++ b/trytond_sale_price_list.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_party >= 3.8, < 3.9
-trytond_product_price_list >= 3.8, < 3.9
-trytond_sale >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_party >= 4.0, < 4.1
+trytond_product_price_list >= 4.0, < 4.1
+trytond_sale >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-sale-price-list
More information about the tryton-debian-vcs
mailing list