[tryton-debian-vcs] tryton-modules-stock-split branch debian-wheezy-2.6 updated. debian/2.6.2-1-3-g838018a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 18 10:05:37 UTC 2015
The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-split.git;a=commitdiff;h=debian/2.6.2-1-3-g838018a
commit 838018a310ebb55e3dcd2b66feffdb362f859f8a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 18 10:20:02 2015 +0100
Releasing debian version 2.6.3-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 01a2236..b528df1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-stock-split (2.6.3-1) unstable; urgency=medium
+
+ * Merging upstream version 2.6.3.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 18 Feb 2015 10:20:02 +0100
+
tryton-modules-stock-split (2.6.2-1) unstable; urgency=medium
* Merging upstream version 2.6.2.
commit 537066dc9de712e828efcc2bfc39c7de19feb2bf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 18 10:20:01 2015 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 422a7f4..542de8d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2012-2014 Cédric Krier
- 2012-2014 B2CK SPRL
+Copyright: 2012-2015 Cédric Krier
+ 2012-2015 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 5a1c109e223f1d33735ba668d856b4e9235e61af
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 18 10:20:01 2015 +0100
Merging upstream version 2.6.3.
diff --git a/CHANGELOG b/CHANGELOG
index ec77978..4402203 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.3 - 2015-02-17
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.2 - 2014-11-06
* 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 bdaac08..e51f248 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock_split
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module to split stock move
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/setup.py b/setup.py
index 2f6069f..d2e1625 100644
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,7 @@ for dep in info.get('depends', []):
minor_version + 1))
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)]
+tests_require = []
setup(name='trytond_stock_split',
version=info.get('version', '0.0.1'),
diff --git a/tests/test_stock_split.py b/tests/test_stock_split.py
index e8311eb..2030ba3 100644
--- a/tests/test_stock_split.py
+++ b/tests/test_stock_split.py
@@ -10,6 +10,7 @@ if os.path.isdir(DIR):
sys.path.insert(0, os.path.dirname(DIR))
import unittest
+import doctest
from decimal import Decimal
import trytond.tests.test_tryton
@@ -122,7 +123,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(
StockSplitTestCase))
diff --git a/tryton.cfg b/tryton.cfg
index 82270a8..77219e1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.2
+version=2.6.3
depends:
ir
stock
diff --git a/trytond_stock_split.egg-info/PKG-INFO b/trytond_stock_split.egg-info/PKG-INFO
index 04e0bfd..f6e4001 100644
--- a/trytond_stock_split.egg-info/PKG-INFO
+++ b/trytond_stock_split.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock-split
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module to split stock move
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-stock-split
More information about the tryton-debian-vcs
mailing list