diff --git a/base_external_dbsource_mysql/__manifest__.py b/base_external_dbsource_mysql/__manifest__.py index 0c0f2df7..0d395371 100644 --- a/base_external_dbsource_mysql/__manifest__.py +++ b/base_external_dbsource_mysql/__manifest__.py @@ -3,13 +3,13 @@ # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). { "name": "External Database Source - MySQL", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "category": "Tools", - "author": "Daniel Reis, " "LasLabs, " "Odoo Community Association (OCA)", + "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",], + "depends": ["base_external_dbsource"], + "external_dependencies": {"python": ["sqlalchemy", "mysqlclient"]}, + "demo": ["demo/base_external_dbsource.xml"], "installable": True, } diff --git a/base_external_dbsource_mysql/models/base_external_dbsource.py b/base_external_dbsource_mysql/models/base_external_dbsource.py index 3b6dd0ce..32f367c8 100644 --- a/base_external_dbsource_mysql/models/base_external_dbsource.py +++ b/base_external_dbsource_mysql/models/base_external_dbsource.py @@ -2,34 +2,13 @@ # Copyright 2016 LasLabs Inc. # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -import logging +import sqlalchemy from odoo import models -_logger = logging.getLogger(__name__) +from odoo.addons.base_external_dbsource.models import base_external_dbsource -try: - from odoo.addons.base_external_dbsource.models import base_external_dbsource - - CONNECTORS = base_external_dbsource.BaseExternalDbsource.CONNECTORS - try: - import MySQLdb - - CONNECTORS.append(("mysql", "MySQL")) - assert MySQLdb - except (ImportError, AssertionError): - _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.' - ) -except ImportError: - _logger.info("base_external_dbsource Odoo module not found.") +base_external_dbsource.BaseExternalDbsource.CONNECTORS.append(("mysql", "MySQL")) class BaseExternalDbsource(models.Model): diff --git a/base_external_dbsource_mysql/readme/CONTRIBUTORS.rst b/base_external_dbsource_mysql/readme/CONTRIBUTORS.rst index aea7525a..49c84834 100644 --- a/base_external_dbsource_mysql/readme/CONTRIBUTORS.rst +++ b/base_external_dbsource_mysql/readme/CONTRIBUTORS.rst @@ -3,3 +3,4 @@ * Gervais Naoussi * Dave Lasley * Sergio Teruel +* David Alonso 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 0151440a..f45eb03b 100644 --- a/base_external_dbsource_mysql/tests/test_base_external_dbsource.py +++ b/base_external_dbsource_mysql/tests/test_base_external_dbsource.py @@ -5,14 +5,14 @@ import mock from odoo.tests import common ADAPTER = ( - "odoo.addons.base_external_dbsource_mysql.models" ".base_external_dbsource.MySQLdb" + "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 """