[tryton-debian-vcs] tryton-modules-party-siret branch upstream updated. upstream/3.8.0-1-gc8cc81a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:20:46 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-party-siret.git;a=commitdiff;h=upstream/3.8.0-1-gc8cc81a
commit c8cc81a96c94add3e4f4247d64bfc10eb93f6e71
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:06 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 4ffab2d..5c4a618 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 1675561..67e9676 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2010-2015 Cédric Krier.
+Copyright (C) 2010-2016 Cédric Krier.
Copyright (C) 2010-2013 Bertrand Chenal.
-Copyright (C) 2010-2015 B2CK SPRL.
+Copyright (C) 2010-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 1f18ba3..b528d0a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_party_siret
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add SIRET/SIREN on parties
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_party_siret
===================
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
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
@@ -68,6 +69,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/address.py b/address.py
index 0cea9b3..3f86c6b 100644
--- a/address.py
+++ b/address.py
@@ -6,10 +6,10 @@ from trytond.pool import PoolMeta
from . import luhn
__all__ = ['Address']
-__metaclass__ = PoolMeta
class Address:
+ __metaclass__ = PoolMeta
__name__ = 'party.address'
siret_nic = fields.Char('SIRET NIC', select=True, states={
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
new file mode 100644
index 0000000..022df11
--- /dev/null
+++ b/locale/lo_LA.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.address:"
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
+msgstr ""
+
+msgctxt "error:party.party:"
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
+msgstr ""
+
+msgctxt "field:party.address,siret:"
+msgid "SIRET"
+msgstr ""
+
+msgctxt "field:party.address,siret_nic:"
+msgid "SIRET NIC"
+msgstr ""
+
+msgctxt "field:party.party,siren:"
+msgid "SIREN"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
new file mode 100644
index 0000000..022df11
--- /dev/null
+++ b/locale/zh_CN.po
@@ -0,0 +1,23 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:party.address:"
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
+msgstr ""
+
+msgctxt "error:party.party:"
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
+msgstr ""
+
+msgctxt "field:party.address,siret:"
+msgid "SIRET"
+msgstr ""
+
+msgctxt "field:party.address,siret_nic:"
+msgid "SIRET NIC"
+msgstr ""
+
+msgctxt "field:party.party,siren:"
+msgid "SIREN"
+msgstr ""
diff --git a/party.py b/party.py
index 993f354..e252d82 100644
--- a/party.py
+++ b/party.py
@@ -6,10 +6,10 @@ from trytond.pool import PoolMeta
from . import luhn
__all__ = ['Party']
-__metaclass__ = PoolMeta
class Party:
+ __metaclass__ = PoolMeta
__name__ = 'party.party'
siren = fields.Char('SIREN', select=True, states={
diff --git a/setup.py b/setup.py
index 78e1e68..5f2d685 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'))
@@ -76,6 +82,7 @@ setup(name=name,
'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',
@@ -89,6 +96,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 +112,5 @@ setup(name=name,
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ use_2to3=True,
)
diff --git a/tests/__init__.py b/tests/__init__.py
index ed1e93c..2216d3b 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_party_siret import suite
+try:
+ from trytond.modules.party_siret.tests.test_party_siret import suite
+except ImportError:
+ from .test_party_siret import suite
__all__ = ['suite']
diff --git a/tests/test_party_siret.py b/tests/test_party_siret.py
index ffc55d4..9cdd723 100644
--- a/tests/test_party_siret.py
+++ b/tests/test_party_siret.py
@@ -10,7 +10,7 @@ class PartySiretTestCase(ModuleTestCase):
'Test PartySiret module'
module = 'party_siret'
- def test0010luhn(self):
+ def test_luhn(self):
'Test luhn'
values = (
(4111111111111111, True),
diff --git a/tryton.cfg b/tryton.cfg
index 0c88038..da0ad53 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_party_siret.egg-info/PKG-INFO b/trytond_party_siret.egg-info/PKG-INFO
index 4a1824b..cdcb180 100644
--- a/trytond_party_siret.egg-info/PKG-INFO
+++ b/trytond_party_siret.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-party-siret
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add SIRET/SIREN on parties
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_party_siret
===================
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
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
@@ -68,6 +69,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_party_siret.egg-info/SOURCES.txt b/trytond_party_siret.egg-info/SOURCES.txt
index 3a5e641..d1504d9 100644
--- a/trytond_party_siret.egg-info/SOURCES.txt
+++ b/trytond_party_siret.egg-info/SOURCES.txt
@@ -52,11 +52,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_party_siret.egg-info/PKG-INFO
trytond_party_siret.egg-info/SOURCES.txt
trytond_party_siret.egg-info/dependency_links.txt
diff --git a/trytond_party_siret.egg-info/requires.txt b/trytond_party_siret.egg-info/requires.txt
index fb92f88..4b6ae47 100644
--- a/trytond_party_siret.egg-info/requires.txt
+++ b/trytond_party_siret.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_party >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_party >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-party-siret
More information about the tryton-debian-vcs
mailing list