diff --git a/.isort.cfg b/.isort.cfg index e35d22a48..7683badfa 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -9,4 +9,4 @@ line_length=88 known_odoo=odoo known_odoo_addons=odoo.addons sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER -known_third_party=mock,setuptools +default_section=THIRDPARTY diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3ba385896..f50c43d1c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ exclude: | # Repos using Sphinx to generate docs don't need prettying ^docs/_templates/.*\.html$| # You don't usually want a bot to modify your legal texts - /(LICENSE|COPYING) + (LICENSE.*|COPYING.*) default_language_version: python: python3 repos: @@ -30,7 +30,7 @@ repos: name: prettier xml plugin additional_dependencies: - "prettier@1.19.1" - - "@prettier/plugin-xml@0.5.0" + - "@prettier/plugin-xml@0.7.2" files: \.xml$ - repo: https://github.com/pre-commit/mirrors-eslint rev: v6.8.0 @@ -85,10 +85,6 @@ repos: rev: v1.26.2 hooks: - id: pyupgrade - - repo: https://github.com/asottile/seed-isort-config - rev: v1.9.4 - hooks: - - id: seed-isort-config - repo: https://github.com/pre-commit/mirrors-isort rev: v4.3.21 hooks: diff --git a/.prettierrc.yml b/.prettierrc.yml index 0b7d15a5f..fc5f3a7c4 100644 --- a/.prettierrc.yml +++ b/.prettierrc.yml @@ -5,3 +5,4 @@ printWidth: 88 proseWrap: always semi: true trailingComma: "es5" +xmlWhitespaceSensitivity: "ignore" diff --git a/web_decimal_numpad_dot/views/web_decimal_numpad_dot.xml b/web_decimal_numpad_dot/views/web_decimal_numpad_dot.xml index 8bc4a39f4..67a7d02ec 100644 --- a/web_decimal_numpad_dot/views/web_decimal_numpad_dot.xml +++ b/web_decimal_numpad_dot/views/web_decimal_numpad_dot.xml @@ -1,6 +1,5 @@ - - diff --git a/web_dialog_size/static/src/xml/web_dialog_size.xml b/web_dialog_size/static/src/xml/web_dialog_size.xml index 86c0626e3..d43a79b73 100644 --- a/web_dialog_size/static/src/xml/web_dialog_size.xml +++ b/web_dialog_size/static/src/xml/web_dialog_size.xml @@ -5,12 +5,12 @@ - - + + + + + + diff --git a/web_environment_ribbon/data/ribbon_data.xml b/web_environment_ribbon/data/ribbon_data.xml index 0c1464c4b..72a502490 100644 --- a/web_environment_ribbon/data/ribbon_data.xml +++ b/web_environment_ribbon/data/ribbon_data.xml @@ -2,23 +2,19 @@ - ribbon.name ({db_name})]]> - ribbon.color #f0f0f0 - ribbon.background.color rgba(255,0,0,.6) - diff --git a/web_environment_ribbon/view/base_view.xml b/web_environment_ribbon/view/base_view.xml index 01f10dc69..28bcbf9f6 100644 --- a/web_environment_ribbon/view/base_view.xml +++ b/web_environment_ribbon/view/base_view.xml @@ -3,19 +3,21 @@ Copyright 2016 Antonio Espinosa License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> - - - - - + + + - - - - + + diff --git a/web_responsive/static/src/xml/apps.xml b/web_responsive/static/src/xml/apps.xml index ae9595e02..1f194ae0f 100644 --- a/web_responsive/static/src/xml/apps.xml +++ b/web_responsive/static/src/xml/apps.xml @@ -9,17 +9,14 @@ name="t-attf-href" >#menu_id=#{app.menuID}&action_id=#{app.actionID} - - a - @@ -42,7 +39,6 @@ - - diff --git a/web_responsive/static/src/xml/document_viewer.xml b/web_responsive/static/src/xml/document_viewer.xml index 9339dcbad..ce1352501 100644 --- a/web_responsive/static/src/xml/document_viewer.xml +++ b/web_responsive/static/src/xml/document_viewer.xml @@ -10,7 +10,6 @@ false - @@ -20,21 +19,27 @@ tabindex="0" aria-label="Maximize" title="Maximize" - > + > + + + > + + + > + + diff --git a/web_responsive/static/src/xml/form_view.xml b/web_responsive/static/src/xml/form_view.xml index c9d8c53c2..91faab7e1 100644 --- a/web_responsive/static/src/xml/form_view.xml +++ b/web_responsive/static/src/xml/form_view.xml @@ -6,13 +6,11 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). --> - - - e - d - @@ -50,21 +45,18 @@ Edit - Create - Save - @@ -72,7 +64,6 @@ - @@ -82,13 +73,11 @@ - d - @@ -96,14 +85,12 @@ Create - Save - @@ -111,7 +98,6 @@ - - @@ -149,5 +134,4 @@ - diff --git a/web_responsive/views/res_users.xml b/web_responsive/views/res_users.xml index 18e4cdd71..e0ec07546 100644 --- a/web_responsive/views/res_users.xml +++ b/web_responsive/views/res_users.xml @@ -5,7 +5,6 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). --> - res.users @@ -15,5 +14,4 @@ - diff --git a/web_responsive/views/web.xml b/web_responsive/views/web.xml index 010a53397..c8a742cae 100644 --- a/web_responsive/views/web.xml +++ b/web_responsive/views/web.xml @@ -4,7 +4,6 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). --> - - diff --git a/web_tree_many2one_clickable/views/assets.xml b/web_tree_many2one_clickable/views/assets.xml index a585eacc3..755a256c8 100644 --- a/web_tree_many2one_clickable/views/assets.xml +++ b/web_tree_many2one_clickable/views/assets.xml @@ -3,7 +3,6 @@ Copyright 2019 Alexandre Díaz License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> - - diff --git a/web_widget_bokeh_chart/views/web_widget_bokeh_chart.xml b/web_widget_bokeh_chart/views/web_widget_bokeh_chart.xml index a3b7cb151..09299d2a4 100644 --- a/web_widget_bokeh_chart/views/web_widget_bokeh_chart.xml +++ b/web_widget_bokeh_chart/views/web_widget_bokeh_chart.xml @@ -1,6 +1,5 @@ - - diff --git a/web_widget_image_download/views/assets.xml b/web_widget_image_download/views/assets.xml index 96dfe52d8..f84a50782 100644 --- a/web_widget_image_download/views/assets.xml +++ b/web_widget_image_download/views/assets.xml @@ -2,18 +2,16 @@ - - - - + + - - - - + +