[tryton-debian-vcs] tryton-modules-stock-location-sequence branch upstream updated. upstream/3.4.1-1-g8987ed9
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:07:01 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-stock-location-sequence.git;a=commitdiff;h=upstream/3.4.1-1-g8987ed9
commit 8987ed9196a35d43895aed273f24a12f001a0ae8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:07 2015 +0200
Adding upstream version 3.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index dd6f5b0..25d9e78 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-02-18
+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 a60ccf3..776e665 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_location_sequence
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to add sequence on location
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_location_sequence
===============================
@@ -64,4 +64,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 1b895ab..b2e11ea 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/setup.py b/setup.py
index a32f936..6a2d682 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 = []
+requires = ['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))
@@ -85,6 +85,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 bbbbf52..61178dc 100644
--- a/stock.py
+++ b/stock.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 fields
from trytond.pyson import Not, Eval, Bool
from trytond.transaction import Transaction
@@ -38,4 +40,4 @@ class Location:
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
- return [table.sequence == None, table.sequence]
+ return [table.sequence == Null, table.sequence]
diff --git a/tests/__init__.py b/tests/__init__.py
index 5f5a208..89f1d31 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_location_sequence import suite
diff --git a/tests/test_stock_location_sequence.py b/tests/test_stock_location_sequence.py
index c7aa23e..1879e7b 100644
--- a/tests/test_stock_location_sequence.py
+++ b/tests/test_stock_location_sequence.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 StockLocationSequenceTestCase(unittest.TestCase):
+class StockLocationSequenceTestCase(ModuleTestCase):
'Test StockLocationSequence module'
-
- def setUp(self):
- trytond.tests.test_tryton.install_module('stock_location_sequence')
-
- def test0005views(self):
- 'Test views'
- test_view('stock_location_sequence')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
+ module = 'stock_location_sequence'
def suite():
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_location_sequence.egg-info/PKG-INFO b/trytond_stock_location_sequence.egg-info/PKG-INFO
index ebd56f1..88e45d0 100644
--- a/trytond_stock_location_sequence.egg-info/PKG-INFO
+++ b/trytond_stock_location_sequence.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-location-sequence
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to add sequence on location
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_location_sequence
===============================
@@ -64,4 +64,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_location_sequence.egg-info/requires.txt b/trytond_stock_location_sequence.egg-info/requires.txt
index 90735a7..a75b104 100644
--- a/trytond_stock_location_sequence.egg-info/requires.txt
+++ b/trytond_stock_location_sequence.egg-info/requires.txt
@@ -1,2 +1,3 @@
-trytond_stock >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+python-sql >= 0.4
+trytond_stock >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
--
tryton-modules-stock-location-sequence
More information about the tryton-debian-vcs
mailing list