[tryton-debian-vcs] tryton-modules-stock-supply-day branch debian updated. debian/3.4.1-1-3-gaf37220

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:07:32 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-supply-day.git;a=commitdiff;h=debian/3.4.1-1-3-gaf37220

commit af37220141af3b8a8d61bca8bea1d9c0c57e7c7d
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 07a5be1..11397fa 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 fd385c0..800dcdd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_stock_supply_day
-Version: 3.4.1
+Version: 3.6.0
 Summary: Tryton module to add supply weekdays
 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_supply_day
         ========================
         
@@ -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 3e352e5..40c47bd 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 .purchase import *
diff --git a/purchase.py b/purchase.py
index 8db0725..92c128d 100644
--- a/purchase.py
+++ b/purchase.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 datetime
 from trytond.model import ModelView, ModelSQL, fields
 from trytond.pool import PoolMeta
diff --git a/setup.py b/setup.py
index 1d09db9..f366499 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
@@ -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 7306c1e..52a2a88 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_supply_day import suite
 
diff --git a/tests/test_stock_supply_day.py b/tests/test_stock_supply_day.py
index 36d0963..b8ef3f3 100644
--- a/tests/test_stock_supply_day.py
+++ b/tests/test_stock_supply_day.py
@@ -1,20 +1,21 @@
-#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
 import datetime
 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 StockSupplyDayTestCase(unittest.TestCase):
+class StockSupplyDayTestCase(ModuleTestCase):
     'Test StockSupplyDay module'
+    module = 'stock_supply_day'
 
     def setUp(self):
-        trytond.tests.test_tryton.install_module('stock_supply_day')
+        super(StockSupplyDayTestCase, self).setUp()
         self.uom = POOL.get('product.uom')
         self.uom_category = POOL.get('product.uom.category')
         self.category = POOL.get('product.category')
@@ -27,14 +28,6 @@ class StockSupplyDayTestCase(unittest.TestCase):
         self.product_supplier_day = POOL.get('purchase.product_supplier.day')
         self.user = POOL.get('res.user')
 
-    def test0005views(self):
-        'Test views'
-        test_view('stock_supply_day')
-
-    def test0006depends(self):
-        'Test depends'
-        test_depends()
-
     def test0010compute_supply_date(self):
         'Test compute_supply_date'
         dates = [
@@ -50,10 +43,10 @@ class StockSupplyDayTestCase(unittest.TestCase):
             (datetime.date(2011, 11, 21), 10, None,
                 datetime.date(2011, 12, 1)),
             ]
-            # Purchase date is Monday, 2011-11-21, the regular days to deliver
-            # is 10 days, which would be Wednesday 2011-12-01. But with the
-            # supplier weekday 0 (Monday) the forecast supply date is next
-            # Monday, the 2011-12-05.
+        # Purchase date is Monday, 2011-11-21, the regular days to deliver is
+        # 10 days, which would be Wednesday 2011-12-01. But with the supplier
+        # weekday 0 (Monday) the forecast supply date is next Monday, the
+        # 2011-12-05.
         for purchase_date, delivery_time, weekday, supply_date in dates:
             with Transaction().start(DB_NAME, USER, context=CONTEXT):
                 product_supplier = self.create_product_supplier_day(
@@ -74,9 +67,9 @@ class StockSupplyDayTestCase(unittest.TestCase):
             (datetime.date(2011, 11, 30), 4, 6, datetime.date(2011, 12, 6)),
             (datetime.date(2011, 12, 27), 6, 0, datetime.date(2012, 1, 3)),
             ]
-            # Supply date max is Tuesday, 2012-01-03, the supplier weekday 0
-            # which would be Monday 2012-01-02. But with the 6 days of delivery
-            # the forecast purchase date is the 2011-12-27.
+        # Supply date max is Tuesday, 2012-01-03, the supplier weekday 0 which
+        # would be Monday 2012-01-02. But with the 6 days of delivery the
+        # forecast purchase date is the 2011-12-27.
         for purchase_date, delivery_time, weekday, supply_date in dates:
             with Transaction().start(DB_NAME, USER, context=CONTEXT):
                 product_supplier = self.create_product_supplier_day(
diff --git a/tryton.cfg b/tryton.cfg
index 7ed80fc..a378c4c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.1
+version=3.6.0
 depends:
     ir
     purchase
diff --git a/trytond_stock_supply_day.egg-info/PKG-INFO b/trytond_stock_supply_day.egg-info/PKG-INFO
index afe841b..ddf81d6 100644
--- a/trytond_stock_supply_day.egg-info/PKG-INFO
+++ b/trytond_stock_supply_day.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-stock-supply-day
-Version: 3.4.1
+Version: 3.6.0
 Summary: Tryton module to add supply weekdays
 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_supply_day
         ========================
         
@@ -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_stock_supply_day.egg-info/requires.txt b/trytond_stock_supply_day.egg-info/requires.txt
index 949f0a1..dba6cd8 100644
--- a/trytond_stock_supply_day.egg-info/requires.txt
+++ b/trytond_stock_supply_day.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_purchase >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_purchase >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
-- 
tryton-modules-stock-supply-day



More information about the tryton-debian-vcs mailing list