[tryton-debian-vcs] tryton-modules-dashboard branch upstream-4.2 updated. upstream/4.2.0-1-g9e52093
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jun 11 22:36:33 UTC 2017
The following commit has been merged in the upstream-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-dashboard.git;a=commitdiff;h=upstream/4.2.0-1-g9e52093
commit 9e520935aef789feebc87d61b8bf575916b5d823
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jun 11 22:40:30 2017 +0200
Adding upstream version 4.2.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 24cf339..ac3e9c0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-06-06
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 163ea53..c2c9f7f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2016 Cédric Krier.
+Copyright (C) 2009-2017 Cédric Krier.
Copyright (C) 2009-2013 Bertrand Chenal.
-Copyright (C) 2009-2016 B2CK SPRL.
+Copyright (C) 2009-2017 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 e8f08eb..d84db92 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_dashboard
-Version: 4.2.0
+Version: 4.2.1
Summary: Tryton module for dashboard
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/ir.py b/ir.py
index 6a321f7..c580e21 100644
--- a/ir.py
+++ b/ir.py
@@ -113,7 +113,7 @@ class View:
else:
group.append(element)
root.append(group)
- arch = etree.tostring(tree, encoding='utf-8')
+ arch = etree.tostring(tree, encoding='utf-8').decode('utf-8')
return arch
@classmethod
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff --git a/tryton.cfg b/tryton.cfg
index 8ae8baa..2256b6d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.2.1
depends:
ir
res
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index 206face..d497ba3 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-dashboard
-Version: 4.2.0
+Version: 4.2.1
Summary: Tryton module for dashboard
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-dashboard
More information about the tryton-debian-vcs
mailing list