From e19252dbeb3eaf75d808f7419362df75d6948d64 Mon Sep 17 00:00:00 2001 From: "David Alonso (Solvos)" Date: Tue, 1 Sep 2020 18:09:29 +0200 Subject: [PATCH] [IMP] base_external_dbsource_mysql: black, isort, prettier --- base_external_dbsource_mysql/__manifest__.py | 31 ++++++------------- .../demo/base_external_dbsource.xml | 6 ++-- .../models/base_external_dbsource.py | 21 +++++++------ .../readme/CONFIGURE.rst | 2 +- .../tests/test_base_external_dbsource.py | 21 +++++-------- setup/base_external_dbsource_mysql/setup.py | 6 ++++ 6 files changed, 40 insertions(+), 47 deletions(-) create mode 100644 setup/base_external_dbsource_mysql/setup.py diff --git a/base_external_dbsource_mysql/__manifest__.py b/base_external_dbsource_mysql/__manifest__.py index a2ab9578..0c0f2df7 100644 --- a/base_external_dbsource_mysql/__manifest__.py +++ b/base_external_dbsource_mysql/__manifest__.py @@ -2,25 +2,14 @@ # Copyright 2016 LasLabs Inc. # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). { - 'name': 'External Database Source - MySQL', - 'version': '12.0.1.0.0', - 'category': 'Tools', - 'author': "Daniel Reis, " - "LasLabs, " - "Odoo Community Association (OCA)", - 'website': 'https://github.com/OCA/server-backend', - 'license': 'LGPL-3', - 'depends': [ - 'base_external_dbsource', - ], - 'external_dependencies': { - 'python': [ - 'sqlalchemy', - 'MySQLdb', - ], - }, - 'demo': [ - 'demo/base_external_dbsource.xml', - ], - 'installable': True, + "name": "External Database Source - MySQL", + "version": "12.0.1.0.0", + "category": "Tools", + "author": "Daniel Reis, " "LasLabs, " "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/server-backend", + "license": "LGPL-3", + "depends": ["base_external_dbsource",], + "external_dependencies": {"python": ["sqlalchemy", "MySQLdb",],}, + "demo": ["demo/base_external_dbsource.xml",], + "installable": True, } diff --git a/base_external_dbsource_mysql/demo/base_external_dbsource.xml b/base_external_dbsource_mysql/demo/base_external_dbsource.xml index 89ebe0f0..9444c6fa 100644 --- a/base_external_dbsource_mysql/demo/base_external_dbsource.xml +++ b/base_external_dbsource_mysql/demo/base_external_dbsource.xml @@ -1,8 +1,10 @@ - + MySQL Demo - Server=myServerAddress;Database=myDataBase;Uid=myUsername; + Server=myServerAddress;Database=myDataBase;Uid=myUsername; password mysql diff --git a/base_external_dbsource_mysql/models/base_external_dbsource.py b/base_external_dbsource_mysql/models/base_external_dbsource.py index 68c1c7e2..3b6dd0ce 100644 --- a/base_external_dbsource_mysql/models/base_external_dbsource.py +++ b/base_external_dbsource_mysql/models/base_external_dbsource.py @@ -9,24 +9,27 @@ from odoo import models _logger = logging.getLogger(__name__) try: - from odoo.addons.base_external_dbsource.models import ( - base_external_dbsource, - ) + from odoo.addons.base_external_dbsource.models import base_external_dbsource + CONNECTORS = base_external_dbsource.BaseExternalDbsource.CONNECTORS try: import MySQLdb - CONNECTORS.append(('mysql', 'MySQL')) + + CONNECTORS.append(("mysql", "MySQL")) assert MySQLdb except (ImportError, AssertionError): - _logger.info('MySQLdb not available. Please install "mysqlclient" ' - 'python package.') + _logger.info( + 'MySQLdb not available. Please install "mysqlclient" ' "python package." + ) try: import sqlalchemy except ImportError: - _logger.info('SQLAlchemy library not available. Please ' - 'install "sqlalchemy" python package.') + _logger.info( + "SQLAlchemy library not available. Please " + 'install "sqlalchemy" python package.' + ) except ImportError: - _logger.info('base_external_dbsource Odoo module not found.') + _logger.info("base_external_dbsource Odoo module not found.") class BaseExternalDbsource(models.Model): diff --git a/base_external_dbsource_mysql/readme/CONFIGURE.rst b/base_external_dbsource_mysql/readme/CONFIGURE.rst index ce19b386..f8fb7dd3 100644 --- a/base_external_dbsource_mysql/readme/CONFIGURE.rst +++ b/base_external_dbsource_mysql/readme/CONFIGURE.rst @@ -1,4 +1,4 @@ To configure this module, you need to: #. Database sources can be configured in Settings > Technical > - Database Structure > Database sources. \ No newline at end of file + Database Structure > Database sources. diff --git a/base_external_dbsource_mysql/tests/test_base_external_dbsource.py b/base_external_dbsource_mysql/tests/test_base_external_dbsource.py index 51af780c..0151440a 100644 --- a/base_external_dbsource_mysql/tests/test_base_external_dbsource.py +++ b/base_external_dbsource_mysql/tests/test_base_external_dbsource.py @@ -4,18 +4,15 @@ import mock from odoo.tests import common - -ADAPTER = ('odoo.addons.base_external_dbsource_mysql.models' - '.base_external_dbsource.MySQLdb') +ADAPTER = ( + "odoo.addons.base_external_dbsource_mysql.models" ".base_external_dbsource.MySQLdb" +) class TestBaseExternalDbsource(common.TransactionCase): - def setUp(self): super(TestBaseExternalDbsource, self).setUp() - self.dbsource = self.env.ref( - 'base_external_dbsource_mysql.demo_mysql', - ) + self.dbsource = self.env.ref("base_external_dbsource_mysql.demo_mysql",) def test_connection_close_mysql(self): """ It should close the connection """ @@ -25,17 +22,13 @@ class TestBaseExternalDbsource(common.TransactionCase): def test_connection_open_mysql(self): """ It should call SQLAlchemy open """ - with mock.patch.object( - self.dbsource, 'connection_open_mysql' - ) as parent_method: + with mock.patch.object(self.dbsource, "connection_open_mysql") as parent_method: self.dbsource.connection_open_mysql() parent_method.assert_called_once_with() def test_excecute_mysql(self): """ It should pass args to SQLAlchemy execute """ - expect = 'sqlquery', 'sqlparams', 'metadata' - with mock.patch.object( - self.dbsource, 'execute_mysql' - ) as parent_method: + expect = "sqlquery", "sqlparams", "metadata" + with mock.patch.object(self.dbsource, "execute_mysql") as parent_method: self.dbsource.execute_mysql(*expect) parent_method.assert_called_once_with(*expect) diff --git a/setup/base_external_dbsource_mysql/setup.py b/setup/base_external_dbsource_mysql/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/base_external_dbsource_mysql/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)