[tryton-debian-vcs] tryton-modules-carrier-weight branch debian updated. debian/3.4.0-1-5-g7088de5
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Mar 4 00:33:14 UTC 2015
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-weight.git;a=commitdiff;h=debian/3.4.0-1-5-g7088de5
commit 7088de53a40990aca471d33344c0ac3dea4737bb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 3 13:10:44 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 6c6d5c1..1270447 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-carrier-weight (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 13:10:44 +0100
+
tryton-modules-carrier-weight (3.4.0-1) unstable; urgency=medium
* Updating signing key while using now plain .asc files instead of .pgp
commit d73d7cea25544543c38e82f5a91306a42f884e8a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 3 13:10:43 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 e787121813873831039521dc3b251bfa3d1c1dd0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 3 13:10:43 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 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 c52b654..458516f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_carrier_weight
-Version: 3.4.0
+Version: 3.4.1
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 8142fee..04f524d 100644
--- a/tests/test_carrier_weight.py
+++ b/tests/test_carrier_weight.py
@@ -92,11 +92,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 d8e755c..f39582c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.0
+version=3.4.1
depends:
carrier
company
diff --git a/trytond_carrier_weight.egg-info/PKG-INFO b/trytond_carrier_weight.egg-info/PKG-INFO
index 983493e..555b2ec 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.4.0
+Version: 3.4.1
Summary: Tryton module to add cost method "on weight" on carrier
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-carrier-weight
More information about the tryton-debian-vcs
mailing list