[tryton-debian-vcs] tryton-modules-dashboard branch upstream updated. upstream/3.4.1-1-g8d1f76b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:03:58 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-dashboard.git;a=commitdiff;h=upstream/3.4.1-1-g8d1f76b
commit 8d1f76b3856b7dda25ca555fe53824028d0da53d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 16:59:58 2015 +0200
Adding upstream version 3.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 15f9bde..fad8220 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-02-26
+Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
-
+* Add support for PyPy
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 3d6dc92..d2952a7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_dashboard
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module for dashboard
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_dashboard
=================
@@ -63,4 +63,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index a23e5e7..0f52c4b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from trytond.pool import Pool
from .dashboard import *
diff --git a/dashboard.py b/dashboard.py
index 406fe05..973cd65 100644
--- a/dashboard.py
+++ b/dashboard.py
@@ -1,5 +1,7 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+from sql import Null
+
from trytond.model import ModelView, ModelSQL, fields
from trytond.transaction import Transaction
from trytond import backend
@@ -45,4 +47,4 @@ class DashboardAction(ModelSQL, ModelView):
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
- return [table.sequence == None, table.sequence]
+ return [table.sequence == Null, table.sequence]
diff --git a/ir.py b/ir.py
index 9f1f9fe..cf1878c 100644
--- a/ir.py
+++ b/ir.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
import math
from lxml import etree
from trytond.transaction import Transaction
diff --git a/locale/es_EC.po b/locale/es_EC.po
index ba19f63..e07846f 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -8,11 +8,11 @@ msgstr "Acción"
msgctxt "field:dashboard.action,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:dashboard.action,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:dashboard.action,id:"
msgid "ID"
@@ -32,23 +32,23 @@ msgstr "Usuario"
msgctxt "field:dashboard.action,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:dashboard.action,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:res.user,dashboard_actions:"
msgid "Dashboard Actions"
-msgstr "Acciones del Escritorio"
+msgstr "Acciones del escritorio"
msgctxt "field:res.user,dashboard_layout:"
msgid "Dashboard Layout"
-msgstr "Organización del Escritorio"
+msgstr "Organización del escritorio"
msgctxt "model:dashboard.action,name:"
msgid "Dashboard Action"
-msgstr "Acción del Escritorio"
+msgstr "Acción del escritorio"
msgctxt "model:ir.action,name:act_dashboard"
msgid "Dashboard"
@@ -64,27 +64,27 @@ msgstr "Cuadrado"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Bottom"
-msgstr "De Arriba a Abajo"
+msgstr "De arriba a abajo"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Left"
-msgstr "De Derecha a Izquierda"
+msgstr "De derecha a izquierda"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Right"
-msgstr "De Izquierda a Derecha"
+msgstr "De izquierda a derecha"
msgctxt "selection:res.user,dashboard_layout:"
msgid "Stack Top"
-msgstr "De Abajo a Arriba"
+msgstr "De abajo a arriba"
msgctxt "view:dashboard.action:"
msgid "Dashboard Action"
-msgstr "Acción del Escritorio"
+msgstr "Acción del escritorio"
msgctxt "view:dashboard.action:"
msgid "Dashboard Actions"
-msgstr "Acciones del Escritorio"
+msgstr "Acciones del escritorio"
msgctxt "view:res.user:"
msgid "Dashboard"
diff --git a/res.py b/res.py
index bb0e3e8..d75c7ef 100644
--- a/res.py
+++ b/res.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from trytond.model import fields
from trytond import backend
from trytond.transaction import Transaction
diff --git a/setup.py b/setup.py
index c5ade17..725d8fb 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from setuptools import setup
import re
@@ -41,7 +41,7 @@ if minor_version % 2:
'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
name[8:], name, version))
-requires = ['lxml']
+requires = ['lxml', 'python-sql >= 0.4']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
@@ -84,6 +84,8 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/tests/__init__.py b/tests/__init__.py
index 5ec8ff9..832ebb8 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from .test_dashboard import suite
diff --git a/tests/test_dashboard.py b/tests/test_dashboard.py
index 7e90414..cb7e322 100644
--- a/tests/test_dashboard.py
+++ b/tests/test_dashboard.py
@@ -1,23 +1,13 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
-class DashboardTestCase(unittest.TestCase):
+class DashboardTestCase(ModuleTestCase):
'Test Dashboard module'
-
- def setUp(self):
- trytond.tests.test_tryton.install_module('dashboard')
-
- def test0005views(self):
- 'Test views'
- test_view('dashboard')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
+ module = 'dashboard'
def suite():
diff --git a/tryton.cfg b/tryton.cfg
index 4acbcdb..75a7c34 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
ir
res
diff --git a/trytond_dashboard.egg-info/PKG-INFO b/trytond_dashboard.egg-info/PKG-INFO
index f40f489..200a576 100644
--- a/trytond_dashboard.egg-info/PKG-INFO
+++ b/trytond_dashboard.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-dashboard
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module for dashboard
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_dashboard
=================
@@ -63,4 +63,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_dashboard.egg-info/requires.txt b/trytond_dashboard.egg-info/requires.txt
index 7231376..877d8e7 100644
--- a/trytond_dashboard.egg-info/requires.txt
+++ b/trytond_dashboard.egg-info/requires.txt
@@ -1,2 +1,3 @@
lxml
-trytond >= 3.4, < 3.5
\ No newline at end of file
+python-sql >= 0.4
+trytond >= 3.6, < 3.7
\ No newline at end of file
--
tryton-modules-dashboard
More information about the tryton-debian-vcs
mailing list