[tryton-debian-vcs] tryton-modules-carrier-weight branch debian-jessie-3.2 updated. debian/3.2.1-1-4-g1c11aa5

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-carrier-weight.git;a=commitdiff;h=debian/3.2.1-1-4-g1c11aa5

commit 1c11aa56e9884b0e7de075f66422c96218a48da3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 13:14:23 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 18fa859..fc3ed9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-carrier-weight (3.2.2-1) unstable; urgency=medium
+
+  * Adding actual upstream signing key.
+  * Merging upstream version 3.2.2.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 03 Mar 2015 13:14:23 +0100
+
 tryton-modules-carrier-weight (3.2.1-1) unstable; urgency=medium
 
   * Updating signing key while using now plain .asc files instead of .pgp
commit cb6ba1b30b1d80ffead5f4d894247a86edaf6ab2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 13:14:22 2015 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 51c54a0..a9ce73b 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-2013 Bertrand Chenal
-           2011 Nicolas Évrard
-           2011-2014 B2CK SPRL
+           2011-2015 Nicolas Évrard
+           2011-2015 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 7d02f23db9aad1412565564e71213412d7a66017
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 13:14:22 2015 +0100

    Merging upstream version 3.2.2.

diff --git a/CHANGELOG b/CHANGELOG
index e25b23a..368dc78 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.2 - 2015-02-28
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.1 - 2014-11-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 2687aff..501e672 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-2013 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 f176105..a983ba8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_carrier_weight
-Version: 3.2.1
+Version: 3.2.2
 Summary: Tryton module to add cost method "on weight" on carrier
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup.py b/setup.py
index 0c0d42a..9c79573 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 weight" 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_weight.py b/tests/test_carrier_weight.py
index 6c0942e..17bffdf 100644
--- a/tests/test_carrier_weight.py
+++ b/tests/test_carrier_weight.py
@@ -91,11 +91,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 82f1dca..67f82f3 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.1
+version=3.2.2
 depends:
     carrier
     company
diff --git a/trytond_carrier_weight.egg-info/PKG-INFO b/trytond_carrier_weight.egg-info/PKG-INFO
index bec7dbe..bab0998 100644
--- a/trytond_carrier_weight.egg-info/PKG-INFO
+++ b/trytond_carrier_weight.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-carrier-weight
-Version: 3.2.1
+Version: 3.2.2
 Summary: Tryton module to add cost method "on weight" on carrier
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-carrier-weight