From 7967e7c78c88615aaab01b112fb0f88e4ce080b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=BE=20=D0=9A=D0=B0=D1=82?= =?UTF-8?q?=D1=8E=D1=85=D0=B0?= Date: Wed, 1 Feb 2017 16:28:46 +0200 Subject: [PATCH 1/3] Cleanup utils.py --- odoo_rpc_client/utils.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/odoo_rpc_client/utils.py b/odoo_rpc_client/utils.py index 8c38b2a..981a677 100644 --- a/odoo_rpc_client/utils.py +++ b/odoo_rpc_client/utils.py @@ -1,5 +1,4 @@ # -*- encoding: utf-8 -*- -import os import six import functools @@ -8,17 +7,8 @@ 'DirMixIn', 'UConverter', 'wpartial', - 'makedirs', - 'xinput', ) - -# Python 2/3 workaround in raw_input -try: - xinput = raw_input -except NameError: - xinput = input - # Check if anyfield is installed # and import function which converts SField instances to functions try: @@ -28,17 +18,6 @@ def normalizeSField(fn): return fn -def makedirs(path): - """ os.makedirs wrapper. No errors raised if directory already exists - - :param str path: directory path to create - """ - try: - os.makedirs(path) - except os.error: - pass - - def wpartial(func, *args, **kwargs): """Wrapped partial, same as functools.partial decorator, but also calls functools.wrap on its result thus shwing correct From 5e3e16e962f01cf4937b1c90b71e29741010dedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=BE=20=D0=9A=D0=B0=D1=82?= =?UTF-8?q?=D1=8E=D1=85=D0=B0?= Date: Fri, 3 Feb 2017 13:00:06 +0200 Subject: [PATCH 2/3] Fix local connector for odoo-9.0 when odoo.py is on python path --- .travis.yml | 9 +++++---- odoo_rpc_client/connection/local.py | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e927024..e279240 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ matrix: ODOO_PACKAGE="openerp" ODOO_TEST_PROTOCOL='local' WITH_SUDO="sudo" - ODOO_TEST_LOCAL_ARGS="['-c', '/etc/openerp/openerp-server.conf']" + OPENERP_SERVER='/etc/openerp/openerp-server.conf' - python: 2.7 env: ODOO_VERSION="8.0" @@ -69,7 +69,7 @@ matrix: ODOO_PACKAGE="odoo" ODOO_TEST_PROTOCOL='local' WITH_SUDO="sudo" - ODOO_TEST_LOCAL_ARGS="['-c', '/etc/odoo/openerp-server.conf']" + OPENERP_SERVER='/etc/odoo/openerp-server.conf' - python: 2.7 env: ODOO_VERSION="9.0" @@ -77,7 +77,7 @@ matrix: ODOO_PACKAGE="odoo" ODOO_TEST_PROTOCOL='local' WITH_SUDO="sudo" - ODOO_TEST_LOCAL_ARGS="['-c', '/etc/odoo/openerp-server.conf']" + OPENERP_SERVER='/etc/odoo/openerp-server.conf' - python: 2.7 env: ODOO_VERSION="10.0" @@ -85,7 +85,8 @@ matrix: ODOO_PACKAGE="odoo" ODOO_TEST_PROTOCOL='local' WITH_SUDO="sudo" - ODOO_TEST_LOCAL_ARGS="['-c', '/etc/odoo/odoo.conf']" + OPENERP_SERVER='/etc/odoo/odoo.conf' + ODOO_RC='/etc/odoo/odoo.conf' install: diff --git a/odoo_rpc_client/connection/local.py b/odoo_rpc_client/connection/local.py index 50668ee..9a86ebf 100644 --- a/odoo_rpc_client/connection/local.py +++ b/odoo_rpc_client/connection/local.py @@ -114,6 +114,7 @@ def _start_odoo_services(self): try: # Odoo 10.0+ import odoo + import odoo.release # to avoid 9.0 with odoo.py on path except ImportError: try: # Odoo 9.0 and less versions From 1fb9dd19dcf6525feb800c93aab300e2d1b842e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=BE=20=D0=9A=D0=B0=D1=82?= =?UTF-8?q?=D1=8E=D1=85=D0=B0?= Date: Tue, 7 Feb 2017 14:35:31 +0200 Subject: [PATCH 3/3] Bump version + update change log --- CHANGELOG.rst | 6 ++++++ odoo_rpc_client/version.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e7a3e2b..c785a5a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,12 @@ Last changes ============ +Release 0.8.1 +============= + +- Fix local connector for odoo-9.0 when odoo.py is on python path + + Big split: odoo_rpc_client 0.8.0 ============================= diff --git a/odoo_rpc_client/version.py b/odoo_rpc_client/version.py index a974539..9f6df67 100644 --- a/odoo_rpc_client/version.py +++ b/odoo_rpc_client/version.py @@ -1 +1 @@ -version = "0.8.0" # pragma: no cover +version = "0.8.1" # pragma: no cover