[tryton-debian-vcs] tryton-proteus branch debian updated. debian/2.8.0-3-4-ga6844b7

git repository hosting tryton-debian-vcs at m9s.biz
Mon Nov 25 19:39:03 UTC 2013


The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-proteus.git;a=commitdiff;h=debian/2.8.0-3-4-ga6844b7

commit a6844b788d011436a2d804cc8572cc53f0499d11
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Nov 25 20:30:43 2013 +0100

    Releasing debian version 3.0.0-1.

diff --git a/debian/changelog b/debian/changelog
index cd7d0a2..8fc2aa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-proteus (3.0.0-1) unstable; urgency=low
+
+  * Merging upstream version 3.0.0.
+  * Updating to standards version 3.9.5, no changes needed.
+  * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 25 Nov 2013 17:55:58 +0100
+
 tryton-proteus (2.8.0-3) unstable; urgency=low
 
   * Adapting the rules file to work also with git-buildpackage.
commit 3afe14ac88b583eb121316f96760d49987c4891c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Nov 24 19:51:52 2013 +0100

    Changing to buildsystem pybuild.

diff --git a/debian/control b/debian/control
index a48186e..102cbba 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
 Uploaders: Mathias Behrle <mathiasb at m9s.biz>
 Build-Depends:
- debhelper (>= 9), python (>= 2.6.6-3~), python-dateutil, python-setuptools
+ debhelper (>= 9), python (>= 2.6.6-3~), python-dateutil, python-setuptools,
+ dh-python
 Standards-Version: 3.9.5
 Homepage: http://www.tryton.org/
 Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-proteus.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
 #!/usr/bin/make -f
 
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
-	dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
 
-override_dh_auto_clean:
-	dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
 
-override_dh_auto_build:
-	mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
-	mv PKG-INFO PKG-INFO.hen
-	dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
 
-override_dh_auto_install:
-	dh_auto_install
-	rm -rf *.egg-info
-	mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
-	mv PKG-INFO.hen PKG-INFO
+%:
+	dh ${@} --with python2 --buildsystem=pybuild
 
 override_dh_gencontrol:
 	dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 92e554abad8d765bcb1c5b72108ee5bbbf47c4aa
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Nov 24 19:14:21 2013 +0100

    Updating to standards version 3.9.5, no changes needed.

diff --git a/debian/control b/debian/control
index 889a182..a48186e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
 Uploaders: Mathias Behrle <mathiasb at m9s.biz>
 Build-Depends:
  debhelper (>= 9), python (>= 2.6.6-3~), python-dateutil, python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.tryton.org/
 Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-proteus.git
 Vcs-Git: git://debian.tryton.org/packages/tryton-proteus.git
commit 1f7ff8529e97574b5c9266e7e03bfa179f6561ec
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Nov 24 17:28:49 2013 +0100

    Merging upstream version 3.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index 628c5ee..6579877 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 * Add support of fields.Dict
diff --git a/PKG-INFO b/PKG-INFO
index 528d96a..9a334cb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 2.8.0
+Version: 3.0.0
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: LGPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
 Description: proteus
         =======
         
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 528d96a..9a334cb 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 2.8.0
+Version: 3.0.0
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: LGPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
 Description: proteus
         =======
         
diff --git a/proteus.egg-info/requires.txt b/proteus.egg-info/requires.txt
index d9c9147..2275f28 100644
--- a/proteus.egg-info/requires.txt
+++ b/proteus.egg-info/requires.txt
@@ -4,7 +4,7 @@ python-dateutil
 cdecimal
 
 [trytond]
-trytond >= 2.8, < 2.9
+trytond >= 3.0, < 3.1
 
 [simplejson]
 simplejson
\ No newline at end of file
diff --git a/proteus/__init__.py b/proteus/__init__.py
index 257d1c9..9843977 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,7 +3,7 @@
 '''
 A library to access Tryton's models like a client.
 '''
-__version__ = "2.8.0"
+__version__ = "3.0.0"
 __all__ = ['Model', 'Wizard']
 import sys
 try:
@@ -351,6 +351,7 @@ class MetaModelFactory(object):
         'reference': ReferenceDescriptor,
         'date': DateDescriptor,
         'datetime': DateTimeDescriptor,
+        'timestamp': DateTimeDescriptor,
         'time': TimeDescriptor,
         'dict': DictDescriptor,
         'many2one': Many2OneDescriptor,
@@ -630,7 +631,8 @@ class Model(object):
     def __cmp__(self, other):
         'Compare with other'
         if isinstance(other, Model):
-            return cmp(self.id, other.id)
+            return cmp((self.__class__.__name__, self.id),
+                (other.__class__.__name__, other.id))
         if isinstance(other, (bool, NoneType)):
             return 1
         raise NotImplementedError
diff --git a/proteus/config.py b/proteus/config.py
index 436ce8e..39a3148 100644
--- a/proteus/config.py
+++ b/proteus/config.py
@@ -178,10 +178,11 @@ class TrytondConfig(Config):
         super(TrytondConfig, self).__init__()
         from trytond.config import CONFIG
         CONFIG.update_etc(config_file)
+        CONFIG.set_timezone()
         if database_type is not None:
             CONFIG['db_type'] = database_type
         from trytond.pool import Pool
-        from trytond.backend import Database
+        from trytond import backend
         from trytond.protocols.dispatcher import create
         from trytond.cache import Cache
         from trytond.transaction import Transaction
@@ -197,12 +198,9 @@ class TrytondConfig(Config):
 
         Pool.start()
 
-        database = Database().connect()
-        cursor = database.cursor()
-        try:
-            databases = database.list(cursor)
-        finally:
-            cursor.close()
+        with Transaction().start(None, 0) as transaction:
+            cursor = transaction.cursor
+            databases = backend.get('Database').list(cursor)
         if database_name not in databases:
             create(database_name, CONFIG['admin_passwd'], language, password)
 
-- 
tryton-proteus



More information about the tryton-debian-vcs mailing list