[tryton-debian-vcs] tryton-modules-stock-split branch debian updated. debian/3.4.1-1-3-g175397f

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:07:22 UTC 2015


The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-split.git;a=commitdiff;h=debian/3.4.1-1-3-g175397f

commit 175397f43f1c2ba840553e163f2202558d61966a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Apr 23 17:00:09 2015 +0200

    Merging upstream version 3.6.0.

diff --git a/CHANGELOG b/CHANGELOG
index 88243cc..0b9ea32 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-02-17
+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 ebee416..26da220 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_stock_split
-Version: 3.4.1
+Version: 3.6.0
 Summary: Tryton module to split stock move
 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_stock_split
         ===================
         
@@ -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 12b4d1a..ba23503 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 .stock import *
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index f854027..5a947d5 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -16,7 +16,7 @@ msgstr "Quantitat"
 
 msgctxt "field:stock.move.split.start,unit_digits:"
 msgid "Unit Digits"
-msgstr "Decimals unitaris"
+msgstr "Decimals de la unitat"
 
 msgctxt "field:stock.move.split.start,uom:"
 msgid "Uom"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 85d1acd..a0d45c1 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -16,7 +16,7 @@ msgstr "Cantidad"
 
 msgctxt "field:stock.move.split.start,unit_digits:"
 msgid "Unit Digits"
-msgstr "Dígitos de unidad"
+msgstr "Decimales de unidad"
 
 msgctxt "field:stock.move.split.start,uom:"
 msgid "Uom"
diff --git a/setup.py b/setup.py
index 65d37cf..e7e2b7b 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
@@ -87,6 +87,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/stock.py b/stock.py
index 6a08393..7a34a7e 100644
--- a/stock.py
+++ b/stock.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, fields
 from trytond.wizard import Wizard, StateView, StateTransition, Button
 from trytond.pyson import Eval
diff --git a/tests/__init__.py b/tests/__init__.py
index 47c1e5c..f0994ec 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_stock_split import suite
 
diff --git a/tests/test_stock_split.py b/tests/test_stock_split.py
index 4ef1a99..abacffd 100644
--- a/tests/test_stock_split.py
+++ b/tests/test_stock_split.py
@@ -1,19 +1,20 @@
-#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 doctest
 from decimal import Decimal
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
-    test_depends
+from trytond.tests.test_tryton import ModuleTestCase
+from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
 from trytond.transaction import Transaction
 
 
-class StockSplitTestCase(unittest.TestCase):
+class StockSplitTestCase(ModuleTestCase):
     'Test Stock Lot module'
+    module = 'stock_split'
 
     def setUp(self):
-        trytond.tests.test_tryton.install_module('stock_split')
+        super(StockSplitTestCase, self).setUp()
         self.uom = POOL.get('product.uom')
         self.template = POOL.get('product.template')
         self.product = POOL.get('product.product')
@@ -22,14 +23,6 @@ class StockSplitTestCase(unittest.TestCase):
         self.user = POOL.get('res.user')
         self.move = POOL.get('stock.move')
 
-    def test0005views(self):
-        'Test views'
-        test_view('stock_split')
-
-    def test0006depends(self):
-        'Test depends'
-        test_depends()
-
     def test0010split(self):
         'Test split'
         with Transaction().start(DB_NAME, USER, context=CONTEXT):
diff --git a/tryton.cfg b/tryton.cfg
index 79f4cc5..37793bb 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.1
+version=3.6.0
 depends:
     ir
     stock
diff --git a/trytond_stock_split.egg-info/PKG-INFO b/trytond_stock_split.egg-info/PKG-INFO
index 6d6a9ee..37ddb72 100644
--- a/trytond_stock_split.egg-info/PKG-INFO
+++ b/trytond_stock_split.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-stock-split
-Version: 3.4.1
+Version: 3.6.0
 Summary: Tryton module to split stock move
 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_stock_split
         ===================
         
@@ -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_stock_split.egg-info/requires.txt b/trytond_stock_split.egg-info/requires.txt
index 90735a7..a3426d7 100644
--- a/trytond_stock_split.egg-info/requires.txt
+++ b/trytond_stock_split.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_stock >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_stock >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
-- 
tryton-modules-stock-split



More information about the tryton-debian-vcs mailing list