[tryton-debian-vcs] tryton-modules-account-payment-sepa-cfonb branch upstream updated. upstream/3.8.0-1-g9533aa3

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:08:03 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-account-payment-sepa-cfonb.git;a=commitdiff;h=upstream/3.8.0-1-g9533aa3

commit 9533aa321bae3622bc8cd3392c6237b2d98e8d1d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:25:50 2016 +0200

    Adding upstream version 4.0.0.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index ef76b2a..b43a07b 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 a085246..a29b425 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2014-2015 Cédric Krier.
-Copyright (C) 2014-2015 B2CK SPRL.
+Copyright (C) 2014-2016 Cédric Krier.
+Copyright (C) 2014-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 83c6475..99f630a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_account_payment_sepa_cfonb
-Version: 3.8.0
+Version: 4.0.0
 Summary: Tryton module for CFONB SEPA payment
 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_account_payment_sepa_cfonb
         ==================================
         
@@ -54,6 +54,7 @@ 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
@@ -67,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/payment.py b/payment.py
index a82d8b8..cf277dd 100644
--- a/payment.py
+++ b/payment.py
@@ -9,11 +9,11 @@ from trytond.pool import PoolMeta
 from trytond.modules.account_payment_sepa import payment as sepa_payment
 
 
-__metaclass__ = PoolMeta
 __all__ = ['Journal', 'Group']
 
 
 class Journal:
+    __metaclass__ = PoolMeta
     __name__ = 'account.payment.journal'
 
     @classmethod
@@ -39,6 +39,7 @@ loader = genshi.template.TemplateLoader([
 
 
 class Group:
+    __metaclass__ = PoolMeta
     __name__ = 'account.payment.group'
 
     def get_sepa_template(self):
diff --git a/setup.py b/setup.py
index 2557d55..fd49e15 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 = ['Genshi', 'lxml']
 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'))
 
@@ -78,6 +84,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',
@@ -91,6 +98,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',
@@ -106,4 +116,5 @@ setup(name=name,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
     tests_require=tests_require,
+    use_2to3=True,
     )
diff --git a/template/pain.001.001.03-cfonb.xml b/template/pain.001.001.03-cfonb.xml
index c5f5e90..982cfb2 100644
--- a/template/pain.001.001.03-cfonb.xml
+++ b/template/pain.001.001.03-cfonb.xml
@@ -23,8 +23,8 @@ this repository contains the full copyright notices and license terms. -->
     </py:def>
     <CstmrCdtTrfInitn>
         <GrpHdr>
-            <MsgId>${group.reference[:35]}</MsgId>
-            <CreDtTm>${datetime.datetime.now().isoformat()}</CreDtTm>
+            <MsgId>${group.number[:35]}</MsgId>
+            <CreDtTm>${datetime.datetime.now().replace(microsecond=0).isoformat()}</CreDtTm>
             <NbOfTxs>${sum(len(payments) for _, payments in group.sepa_payments)}</NbOfTxs>
             <CtrlSum>${sum(p.amount for p in group.payments)}</CtrlSum>
             <InitgPty>
diff --git a/template/pain.008.001.02-cfonb.xml b/template/pain.008.001.02-cfonb.xml
index 580aee1..70c3d55 100644
--- a/template/pain.008.001.02-cfonb.xml
+++ b/template/pain.008.001.02-cfonb.xml
@@ -29,8 +29,8 @@ this repository contains the full copyright notices and license terms. -->
     </py:def>
     <CstmrDrctDbtInitn>
         <GrpHdr>
-            <MsgId>${group.reference[:35]}</MsgId>
-            <CreDtTm>${datetime.datetime.now().isoformat()}</CreDtTm>
+            <MsgId>${group.number[:35]}</MsgId>
+            <CreDtTm>${datetime.datetime.now().replace(microsecond=0).isoformat()}</CreDtTm>
             <NbOfTxs>${sum(len(payments) for _, payments in group.sepa_payments)}</NbOfTxs>
             <CtrlSum>${sum(p.amount for p in group.payments)}</CtrlSum>
             <InitgPty>
diff --git a/tests/__init__.py b/tests/__init__.py
index 2fa912b..cd209f3 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_account_payment_sepa_cfonb import suite
+try:
+    from trytond.modules.account_payment_sepa_cfonb.tests.test_account_payment_sepa_cfonb import suite
+except ImportError:
+    from .test_account_payment_sepa_cfonb import suite
 
 __all__ = ['suite']
diff --git a/tests/test_account_payment_sepa_cfonb.py b/tests/test_account_payment_sepa_cfonb.py
index c72ecc4..ea6aa42 100644
--- a/tests/test_account_payment_sepa_cfonb.py
+++ b/tests/test_account_payment_sepa_cfonb.py
@@ -1,42 +1,32 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 import unittest
-import doctest
-from itertools import chain
 
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import DB_NAME, USER, CONTEXT
-from trytond.transaction import Transaction
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
 
-from trytond.modules.account_payment_sepa.tests.test_account_payment_sepa \
-    import validate_file
+from trytond.modules.account_payment_sepa.tests import validate_file
 
 
 class AccountPaymentSepaCFONBTestCase(ModuleTestCase):
     'Test Account Payment SEPA CFONB module'
     module = 'account_payment_sepa_cfonb'
 
+    @with_transaction()
     def test_pain001_001_03_cfonb(self):
         'Test pain.00r.001.03-cfonb xsd validation'
-        with Transaction().start(DB_NAME, USER, context=CONTEXT):
-            validate_file('pain.001.001.03-cfonb', 'payable',
-                xsd='pain.001.001.03')
+        validate_file('pain.001.001.03-cfonb', 'payable',
+            xsd='pain.001.001.03')
 
+    @with_transaction()
     def test_pain008_001_02_cfonb(self):
         'Test pain.008.001.02-cfonb xsd validation'
-        with Transaction().start(DB_NAME, USER, context=CONTEXT):
-            validate_file('pain.008.001.02-cfonb', 'receivable',
-                xsd='pain.008.001.02')
+        validate_file('pain.008.001.02-cfonb', 'receivable',
+            xsd='pain.008.001.02')
 
 
 def suite():
     suite = trytond.tests.test_tryton.suite()
-    from trytond.modules.company.tests import test_company
-    from trytond.modules.account.tests import test_account
-    for test in chain(test_company.suite(), test_account.suite()):
-        if test not in suite and not isinstance(test, doctest.DocTestCase):
-            suite.addTest(test)
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
             AccountPaymentSepaCFONBTestCase))
     return suite
diff --git a/tryton.cfg b/tryton.cfg
index 8683188..6ce49e0 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.0
+version=4.0.0
 depends:
     account_payment
     account_payment_sepa
diff --git a/trytond_account_payment_sepa_cfonb.egg-info/PKG-INFO b/trytond_account_payment_sepa_cfonb.egg-info/PKG-INFO
index 3f06850..40cc7a9 100644
--- a/trytond_account_payment_sepa_cfonb.egg-info/PKG-INFO
+++ b/trytond_account_payment_sepa_cfonb.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-account-payment-sepa-cfonb
-Version: 3.8.0
+Version: 4.0.0
 Summary: Tryton module for CFONB SEPA payment
 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_account_payment_sepa_cfonb
         ==================================
         
@@ -54,6 +54,7 @@ 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
@@ -67,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_account_payment_sepa_cfonb.egg-info/requires.txt b/trytond_account_payment_sepa_cfonb.egg-info/requires.txt
index 53c81a2..ade1139 100644
--- a/trytond_account_payment_sepa_cfonb.egg-info/requires.txt
+++ b/trytond_account_payment_sepa_cfonb.egg-info/requires.txt
@@ -1,8 +1,8 @@
 Genshi
 lxml
-trytond_account_payment >= 3.8, < 3.9
-trytond_account_payment_sepa >= 3.8, < 3.9
-trytond_company >= 3.8, < 3.9
-trytond_bank >= 3.8, < 3.9
-trytond_party >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_account_payment >= 4.0, < 4.1
+trytond_account_payment_sepa >= 4.0, < 4.1
+trytond_company >= 4.0, < 4.1
+trytond_bank >= 4.0, < 4.1
+trytond_party >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
-- 
tryton-modules-account-payment-sepa-cfonb



More information about the tryton-debian-vcs mailing list