[tryton-debian-vcs] tryton-modules-stock-lot branch upstream updated. upstream/3.4.0-1-ge1ea050
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 25 00:46:49 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-lot.git;a=commitdiff;h=upstream/3.4.0-1-ge1ea050
commit e1ea05051b17bcee3d56c5c198359592402ece13
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 20:13:08 2015 +0100
Adding upstream version 3.4.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index ae78c29..b4d2932 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.1 - 2015-02-18
+* 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 ed88376..0f02a0e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock_lot
-Version: 3.4.0
+Version: 3.4.1
Summary: Tryton module for lot of products
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/setup.py b/setup.py
index 362d1b0..c85a9d4 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,12 @@ 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'), 'python-dateutil']
+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,
@@ -91,6 +96,7 @@ setup(name=name,
],
license='GPL-3',
install_requires=requires,
+ dependency_links=dependency_links,
zip_safe=False,
entry_points="""
[trytond.modules]
diff --git a/tests/scenario_stock_lot_shipment_out.rst b/tests/scenario_stock_lot_shipment_out.rst
index a3d1870..a5d2251 100644
--- a/tests/scenario_stock_lot_shipment_out.rst
+++ b/tests/scenario_stock_lot_shipment_out.rst
@@ -165,5 +165,5 @@ Pack the shipment::
>>> for move in shipment_out.outgoing_moves:
... quantity = lot_quantities.setdefault(move.lot.number, 0)
... lot_quantities[move.lot.number] += move.quantity
- >>> lot_quantities
- {u'00001': 7.0, u'00002': 7.0}
+ >>> sorted(lot_quantities.items())
+ [(u'00001', 7.0), (u'00002', 7.0)]
diff --git a/tests/test_stock_lot.py b/tests/test_stock_lot.py
index f3814d6..05d882f 100644
--- a/tests/test_stock_lot.py
+++ b/tests/test_stock_lot.py
@@ -239,7 +239,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(
StockLotTestCase))
diff --git a/tryton.cfg b/tryton.cfg
index 7d6831b..c298804 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.0
+version=3.4.1
depends:
ir
product
diff --git a/trytond_stock_lot.egg-info/PKG-INFO b/trytond_stock_lot.egg-info/PKG-INFO
index ffd39e0..62919b6 100644
--- a/trytond_stock_lot.egg-info/PKG-INFO
+++ b/trytond_stock_lot.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock-lot
-Version: 3.4.0
+Version: 3.4.1
Summary: Tryton module for lot of products
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-stock-lot
More information about the tryton-debian-vcs
mailing list