[tryton-debian-vcs] tryton-modules-carrier-percentage branch upstream-2.6 updated. upstream/2.6.0-1-g3308d33

[Mathias Behrle]

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

commit 3308d33bfee66997dea1b60d61f470249433cfef
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 11:52:24 2015 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index d2beb67..b237426 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2015-02-28
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 7fcb680..61e9a99 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2012 Cédric Krier.
+Copyright (C) 2011-2015 Cédric Krier.
 Copyright (C) 2011-2012 Bertrand Chenal.
-Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2012 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 5197b03..ffb2387 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_carrier_percentage
-Version: 2.6.0
+Version: 2.6.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 d1f310b..da1b95c 100644
--- a/setup.py
+++ b/setup.py
@@ -30,6 +30,17 @@ for dep in info.get('depends', []):
 requires.append('trytond >= %s.%s, < %s.%s' %
     (major_version, minor_version, major_version, minor_version + 1))
 
+tests_require = ['proteus >= %s.%s, < %s.%s' %
+    (major_version, minor_version, major_version, minor_version + 1),
+    'trytond_purchase_shipment_cost >= %s.%s, < %s.%s' %
+    (major_version, minor_version, major_version, minor_version + 1),
+    'trytond_sale_shipment_cost >= %s.%s, < %s.%s' %
+    (major_version, minor_version, major_version, minor_version + 1)]
+dependency_links = []
+if minor_version % 2:
+    # Add development index for testing with proteus
+    dependency_links.append('https://trydevpi.tryton.org/')
+
 setup(name='trytond_carrier_percentage',
     version=info.get('version', '0.0.1'),
     description='Tryton module to add cost method "on percentage" on carrier',
@@ -71,6 +82,7 @@ setup(name='trytond_carrier_percentage',
         ],
     license='GPL-3',
     install_requires=requires,
+    dependency_links=dependency_links,
     zip_safe=False,
     entry_points="""
     [trytond.modules]
@@ -78,4 +90,5 @@ setup(name='trytond_carrier_percentage',
     """,
     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 b5f7c79..d4a88f4 100644
--- a/tests/test_carrier_percentage.py
+++ b/tests/test_carrier_percentage.py
@@ -102,11 +102,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 3050a5f..b1025f6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     carrier
     currency
diff --git a/trytond_carrier_percentage.egg-info/PKG-INFO b/trytond_carrier_percentage.egg-info/PKG-INFO
index a9d727b..32ef8ab 100644
--- a/trytond_carrier_percentage.egg-info/PKG-INFO
+++ b/trytond_carrier_percentage.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-carrier-percentage
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add cost method "on percentage" on carrier
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_carrier_percentage.egg-info/SOURCES.txt b/trytond_carrier_percentage.egg-info/SOURCES.txt
index 6285b78..0974356 100644
--- a/trytond_carrier_percentage.egg-info/SOURCES.txt
+++ b/trytond_carrier_percentage.egg-info/SOURCES.txt
@@ -9,9 +9,22 @@ setup.py
 tryton.cfg
 ./__init__.py
 ./carrier.py
+./carrier.xml
 ./sale.py
 ./stock.py
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
 ./tests/__init__.py
+./tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
 ./tests/test_carrier_percentage.py
 doc/index.rst
 locale/bg_BG.po
-- 
tryton-modules-carrier-percentage