[tryton-debian-vcs] tryton-modules-carrier-percentage branch debian updated. debian/3.4.0-1-5-g10a6055

[Mathias Behrle]

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

commit 10a6055f4c516adcde836859bcd9840a09b8270b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 11:51:28 2015 +0100

    Releasing debian version 3.4.1-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 18be844..8f88691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-carrier-percentage (3.4.1-1) unstable; urgency=medium
+
+  * Adding actual upstream signing key.
+  * Improving boilerplate in d/control (Closes: #771722).
+  * Merging upstream version 3.4.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 03 Mar 2015 11:51:27 +0100
+
 tryton-modules-carrier-percentage (3.4.0-1) unstable; urgency=medium
 
   * Updating signing key while using now plain .asc files instead of .pgp
commit 8cf271b7552ebcfef7b4362bfafece24d27bca0b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 11:51:27 2015 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 554ffa7..b9f8e2c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2011-2014 Cédric Krier
+Copyright: 2011-2015 Cédric Krier
            2011-2012 Bertrand Chenal
-           2011 Nicolas Évrard
-           2011-2014 B2CK SPRL
+           2011-2015 Nicolas Évrard
+           2011-2015 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 8df621fb425c10a64394b50d6e0ad55fc0027710
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 11:51:27 2015 +0100

    Merging upstream version 3.4.1.

diff --git a/CHANGELOG b/CHANGELOG
index 056ee04..6eb4e40 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.1 - 2015-02-28
+* 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 3731ce2..61e9a99 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2014 Cédric Krier.
+Copyright (C) 2011-2015 Cédric Krier.
 Copyright (C) 2011-2012 Bertrand Chenal.
-Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2014 B2CK SPRL.
+Copyright (C) 2011-2015 Nicolas Évrard.
+Copyright (C) 2011-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 454faaa..4fedf57 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_carrier_percentage
-Version: 3.4.0
+Version: 3.4.1
 Summary: Tryton module to add cost method "on percentage" on carrier
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup.py b/setup.py
index 4d7c9c6..01c18c2 100644
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,14 @@ for dep in info.get('depends', []):
         requires.append(get_require_version('trytond_%s' % dep))
 requires.append(get_require_version('trytond'))
 
+tests_require = [get_require_version('proteus'),
+    get_require_version('trytond_purchase_shipment_cost'),
+    get_require_version('trytond_sale_shipment_cost')]
+dependency_links = []
+if minor_version % 2:
+    # Add development index for testing with proteus
+    dependency_links.append('https://trydevpi.tryton.org/')
+
 setup(name=name,
     version=version,
     description='Tryton module to add cost method "on percentage" on carrier',
@@ -89,6 +97,7 @@ setup(name=name,
         ],
     license='GPL-3',
     install_requires=requires,
+    dependency_links=dependency_links,
     zip_safe=False,
     entry_points="""
     [trytond.modules]
@@ -96,4 +105,5 @@ setup(name=name,
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
+    tests_require=tests_require,
     )
diff --git a/tests/test_carrier_percentage.py b/tests/test_carrier_percentage.py
index c582e56..3c94fda 100644
--- a/tests/test_carrier_percentage.py
+++ b/tests/test_carrier_percentage.py
@@ -76,11 +76,11 @@ def suite():
     suite = trytond.tests.test_tryton.suite()
     from trytond.modules.product.tests import test_product
     for test in test_product.suite():
-        if test not in suite:
+        if test not in suite and not isinstance(test, doctest.DocTestCase):
             suite.addTest(test)
     from trytond.modules.currency.tests import test_currency
     for test in test_currency.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(
             CarrierWeightTestCase))
diff --git a/tryton.cfg b/tryton.cfg
index 2ba4cc4..317b494 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.0
+version=3.4.1
 depends:
     carrier
     currency
diff --git a/trytond_carrier_percentage.egg-info/PKG-INFO b/trytond_carrier_percentage.egg-info/PKG-INFO
index 6857b69..273f4f0 100644
--- a/trytond_carrier_percentage.egg-info/PKG-INFO
+++ b/trytond_carrier_percentage.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-carrier-percentage
-Version: 3.4.0
+Version: 3.4.1
 Summary: Tryton module to add cost method "on percentage" on carrier
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-carrier-percentage