diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 41b346002..c8c28b627 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -140,4 +140,3 @@ repos: args: - --rcfile=.pylintrc-mandatory additional_dependencies: *pylint_deps - diff --git a/connector_magento/__manifest__.py b/connector_magento/__manifest__.py index 14fa33036..ed6dc2fd5 100644 --- a/connector_magento/__manifest__.py +++ b/connector_magento/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Magento Connector", - "version": "13.0.0.0.0", + "version": "13.0.1.0.0", "category": "Connector", "depends": [ "account", @@ -18,7 +18,7 @@ "external_dependencies": {"python": ["magento"]}, "author": "Camptocamp,Akretion,Sodexis,Odoo Community Association (OCA)", "license": "AGPL-3", - "website": "http://www.odoo-magento-connector.com", + "website": "https://github.com/OCA/connector-magento", "images": [ "images/magento_backend.png", "images/jobs.png", diff --git a/connector_magento/components/exporter.py b/connector_magento/components/exporter.py index f1a4710d3..3912011dd 100644 --- a/connector_magento/components/exporter.py +++ b/connector_magento/components/exporter.py @@ -39,7 +39,7 @@ class MagentoBaseExporter(AbstractComponent): _usage = "record.exporter" def __init__(self, working_context): - super(MagentoBaseExporter, self).__init__(working_context) + super().__init__(working_context) self.binding = None self.external_id = None @@ -112,7 +112,6 @@ def _run(self): def _after_export(self): """ Can do several actions after exporting a record on magento """ - pass class MagentoExporter(AbstractComponent): @@ -122,7 +121,7 @@ class MagentoExporter(AbstractComponent): _inherit = "magento.base.exporter" def __init__(self, working_context): - super(MagentoExporter, self).__init__(working_context) + super().__init__(working_context) self.binding = None def _lock(self): diff --git a/connector_magento/doc/conf.py b/connector_magento/doc/conf.py index 443f3087b..840741374 100644 --- a/connector_magento/doc/conf.py +++ b/connector_magento/doc/conf.py @@ -134,7 +134,7 @@ def add_path(*paths): # General information about the project. project = "Odoo Magento Connector" -copyright = "2013-2015, Odoo Community Association (OCA)" +copyright = "2013-2015, Odoo Community Association (OCA)" # pylint: disable=W0622 # The version info for the project you're documenting, acts as # replacement for |version| and |release|, also used in various other diff --git a/connector_magento/wizards/magento_binding_backend_read.py b/connector_magento/wizards/magento_binding_backend_read.py index da9c43fd3..fdfd01fa9 100644 --- a/connector_magento/wizards/magento_binding_backend_read.py +++ b/connector_magento/wizards/magento_binding_backend_read.py @@ -60,8 +60,8 @@ def _get_magento_binding_model(self): except KeyError: _logger.info( "No component registry for database %s. " - "Probably because the Odoo registry has not been built " - "yet." % (self.env.cr.dbname) + "Probably because the Odoo registry has not been built yet.", + self.env.cr.dbname ) return [] component_classes = components_registry.lookup( diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..68a654b44 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +# generated from manifests external_dependencies +magento diff --git a/setup/.setuptools-odoo-make-default-ignore b/setup/.setuptools-odoo-make-default-ignore new file mode 100644 index 000000000..207e61533 --- /dev/null +++ b/setup/.setuptools-odoo-make-default-ignore @@ -0,0 +1,2 @@ +# addons listed in this file are ignored by +# setuptools-odoo-make-default (one addon per line) diff --git a/setup/README b/setup/README new file mode 100644 index 000000000..a63d633e8 --- /dev/null +++ b/setup/README @@ -0,0 +1,2 @@ +To learn more about this directory, please visit +https://pypi.python.org/pypi/setuptools-odoo diff --git a/setup/connector_magento/odoo/addons/connector_magento b/setup/connector_magento/odoo/addons/connector_magento new file mode 120000 index 000000000..9397c4356 --- /dev/null +++ b/setup/connector_magento/odoo/addons/connector_magento @@ -0,0 +1 @@ +../../../../connector_magento \ No newline at end of file diff --git a/setup/connector_magento/setup.py b/setup/connector_magento/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/connector_magento/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)