[tryton-debian-vcs] tryton-modules-stock-split branch upstream updated. upstream/3.4.0-1-g099729b

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Feb 18 10:05:38 UTC 2015


The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-split.git;a=commitdiff;h=upstream/3.4.0-1-g099729b

commit 099729b70d6510ea78897b68ef8efe1ce049aac5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Feb 18 10:19:04 2015 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index e8d2472..88243cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.1 - 2015-02-17
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.0 - 2014-10-20
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 5695e54..776aee6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2014 Cédric Krier.
-Copyright (C) 2012-2014 B2CK SPRL.
+Copyright (C) 2012-2015 Cédric Krier.
+Copyright (C) 2012-2015 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 2dd3991..ebee416 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_split
-Version: 3.4.0
+Version: 3.4.1
 Summary: Tryton module to split stock move
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup.py b/setup.py
index b597027..65d37cf 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ for dep in info.get('depends', []):
     if not re.match(r'(ir|res|webdav)(\W|$)', dep):
         requires.append(get_require_version('trytond_%s' % dep))
 requires.append(get_require_version('trytond'))
-tests_require = [get_require_version('proteus')]
+tests_require = []
 
 setup(name=name,
     version=version,
diff --git a/tests/test_stock_split.py b/tests/test_stock_split.py
index 86b2557..4ef1a99 100644
--- a/tests/test_stock_split.py
+++ b/tests/test_stock_split.py
@@ -1,6 +1,7 @@
 #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 decimal import Decimal
 import trytond.tests.test_tryton
 from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
@@ -110,7 +111,7 @@ def suite():
     suite = trytond.tests.test_tryton.suite()
     from trytond.modules.company.tests import test_company
     for test in test_company.suite():
-        if test not in suite:
+        if test not in suite and not isinstance(test, doctest.DocTestCase):
             suite.addTest(test)
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
             StockSplitTestCase))
diff --git a/tryton.cfg b/tryton.cfg
index 82deaa8..79f4cc5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.0
+version=3.4.1
 depends:
     ir
     stock
diff --git a/trytond_stock_split.egg-info/PKG-INFO b/trytond_stock_split.egg-info/PKG-INFO
index ffaef71..6d6a9ee 100644
--- a/trytond_stock_split.egg-info/PKG-INFO
+++ b/trytond_stock_split.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock-split
-Version: 3.4.0
+Version: 3.4.1
 Summary: Tryton module to split stock move
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock-split



More information about the tryton-debian-vcs mailing list