[tryton-debian-vcs] tryton-modules-carrier branch upstream updated. upstream/3.4.1-1-g391ed4e
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:03:21 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-carrier.git;a=commitdiff;h=upstream/3.4.1-1-g391ed4e
commit 391ed4eafd7f91a6f0db4380967b2fd449e2ccf4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 16:59:55 2015 +0200
Adding upstream version 3.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 8a66574..544d3fc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-02-28
+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 eeafbb3..0ce9d6a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_carrier
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module with carriers
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_carrier
===============
@@ -65,4 +65,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 adc7d5d..e99acb1 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 .carrier import *
diff --git a/carrier.py b/carrier.py
index dc2ee9d..9d77de8 100644
--- a/carrier.py
+++ b/carrier.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 ModelView, ModelSQL, fields
from trytond.transaction import Transaction
from trytond.pool import Pool
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 63ddd11..1f8a0e7 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -4,19 +4,19 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,carrier_cost_method:"
msgid "Carrier Cost Method"
-msgstr "Método de Costo de Transporte"
+msgstr "Método de costo de transporte"
msgctxt "field:carrier,carrier_product:"
msgid "Carrier Product"
-msgstr "Producto que Transporta"
+msgstr "Producto que transporta"
msgctxt "field:carrier,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:carrier,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:carrier,id:"
msgid "ID"
@@ -32,15 +32,15 @@ msgstr "Nombre"
msgctxt "field:carrier,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:carrier,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "help:carrier,carrier_cost_method:"
msgid "Method to compute carrier cost"
-msgstr "Método de cálculo de costo de transporte"
+msgstr "Método para calcular el del transporte"
msgctxt "model:carrier,name:"
msgid "Carrier"
@@ -64,7 +64,7 @@ msgstr "Administración de Transporte"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Product Price"
-msgstr "Precio del Producto"
+msgstr "Precio del producto"
msgctxt "view:carrier:"
msgid "Carrier"
diff --git a/setup.py b/setup.py
index 9a40628..ee9d1fa 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
@@ -86,6 +86,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 94a87d9..9ac1de0 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_carrier import suite
diff --git a/tests/test_carrier.py b/tests/test_carrier.py
index 04c0b1f..792ccda 100644
--- a/tests/test_carrier.py
+++ b/tests/test_carrier.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 CarrierTestCase(unittest.TestCase):
+class CarrierTestCase(ModuleTestCase):
'Test Carrier module'
-
- def setUp(self):
- trytond.tests.test_tryton.install_module('carrier')
-
- def test0005views(self):
- 'Test views'
- test_view('carrier')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
+ module = 'carrier'
def suite():
diff --git a/tryton.cfg b/tryton.cfg
index 59783e9..00a7b01 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
ir
party
diff --git a/trytond_carrier.egg-info/PKG-INFO b/trytond_carrier.egg-info/PKG-INFO
index d299245..9df618c 100644
--- a/trytond_carrier.egg-info/PKG-INFO
+++ b/trytond_carrier.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-carrier
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module with carriers
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_carrier
===============
@@ -65,4 +65,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_carrier.egg-info/requires.txt b/trytond_carrier.egg-info/requires.txt
index 63c4ab6..9ad00c3 100644
--- a/trytond_carrier.egg-info/requires.txt
+++ b/trytond_carrier.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_party >= 3.4, < 3.5
-trytond_product >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_party >= 3.6, < 3.7
+trytond_product >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
--
tryton-modules-carrier
More information about the tryton-debian-vcs
mailing list