From 2f9685d24c4aed83f09165373b185213aba5a2ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Wed, 10 Apr 2024 09:39:21 +0200
Subject: [PATCH] [UPD] add editable top on timesheet view
---
.eslintrc.yml | 1 +
.flake8 | 12 --------
.gitignore | 2 ++
.isort.cfg | 13 ---------
.pre-commit-config.yaml | 55 +++++++++++++++----------------------
.pylintrc-mandatory | 12 ++++----
.ruff.toml | 30 ++++++++++++++++++++
views/hr_timesheet_view.xml | 3 ++
8 files changed, 64 insertions(+), 64 deletions(-)
delete mode 100644 .flake8
delete mode 100644 .isort.cfg
create mode 100644 .ruff.toml
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 9429bc6..fed88d7 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -22,6 +22,7 @@ globals:
odoo: readonly
openerp: readonly
owl: readonly
+ luxon: readonly
# Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
diff --git a/.flake8 b/.flake8
deleted file mode 100644
index e397e8e..0000000
--- a/.flake8
+++ /dev/null
@@ -1,12 +0,0 @@
-[flake8]
-max-line-length = 88
-max-complexity = 16
-# B = bugbear
-# B9 = bugbear opinionated (incl line length)
-select = C,E,F,W,B,B9
-# E203: whitespace before ':' (black behaviour)
-# E501: flake8 line length (covered by bugbear B950)
-# W503: line break before binary operator (black behaviour)
-ignore = E203,E501,W503
-per-file-ignores=
- __init__.py:F401
diff --git a/.gitignore b/.gitignore
index 9c283fd..d99361a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ __pycache__/
*.py[cod]
/.venv
/.pytest_cache
+/.ruff_cache
# C extensions
*.so
@@ -23,6 +24,7 @@ var/
.installed.cfg
*.egg
*.eggs
+.copier-answers.yml
# Installer logs
pip-log.txt
diff --git a/.isort.cfg b/.isort.cfg
deleted file mode 100644
index 0ec187e..0000000
--- a/.isort.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-[settings]
-; see https://github.com/psf/black
-multi_line_output=3
-include_trailing_comma=True
-force_grid_wrap=0
-combine_as_imports=True
-use_parentheses=True
-line_length=88
-known_odoo=odoo
-known_odoo_addons=odoo.addons
-sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER
-default_section=THIRDPARTY
-ensure_newline_before_comments = True
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c575299..3efb4d9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,6 +12,10 @@ exclude: |
/static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$|
+ # Don't bother non-technical authors with formatting issues in docs
+ readme/.*\.(rst|md)$|
+ # Ignore build and dist directories in addons
+ /build/|/dist/|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
@@ -33,27 +37,25 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
- rev: 4cd2b852214dead80822e93e6749b16f2785b2fe
+ rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website
args: ["https://le-filament.com"]
- - repo: https://github.com/myint/autoflake
- rev: v1.6.1
- hooks:
- - id: autoflake
+ - id: oca-gen-addon-readme
args:
- - --expand-star-imports
- - --ignore-init-module-imports
- - --in-place
- - --remove-all-unused-imports
- - --remove-duplicate-keys
- - --remove-unused-variables
- - repo: https://github.com/psf/black
- rev: 22.8.0
+ - --addons-dir=.
+ - --branch=16.0
+ - --org-name=lefilament
+ - --repo-name=template_module
+ - --if-source-changed
+ - --keep-source-digest
+ - repo: https://github.com/OCA/odoo-pre-commit-hooks
+ rev: v0.0.25
hooks:
- - id: black
+ - id: oca-checks-odoo-module
+ - id: oca-checks-po
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1
hooks:
@@ -95,27 +97,14 @@ repos:
- id: check-xml
- id: mixed-line-ending
args: ["--fix=lf"]
- - repo: https://github.com/asottile/pyupgrade
- rev: v2.38.2
- hooks:
- - id: pyupgrade
- args: ["--keep-percent-format"]
- - repo: https://github.com/PyCQA/isort
- rev: 5.10.1
- hooks:
- - id: isort
- name: isort except __init__.py
- args:
- - --settings=.
- exclude: /__init__\.py$
- - repo: https://gitlab.com/PyCQA/flake8
- rev: 3.9.2
+ - repo: https://github.com/astral-sh/ruff-pre-commit
+ rev: v0.1.3
hooks:
- - id: flake8
- name: flake8
- additional_dependencies: ["flake8-bugbear==21.9.2"]
+ - id: ruff
+ args: [--fix, --exit-non-zero-on-fix]
+ - id: ruff-format
- repo: https://github.com/OCA/pylint-odoo
- rev: 7.0.2
+ rev: v8.0.19
hooks:
- id: pylint_odoo
name: pylint with optional checks
diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory
index ed2c217..9906493 100644
--- a/.pylintrc-mandatory
+++ b/.pylintrc-mandatory
@@ -4,12 +4,12 @@ load-plugins=pylint_odoo
score=n
[ODOOLINT]
-readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
-manifest_required_authors=Le Filament
-manifest_required_keys=license
-manifest_deprecated_keys=description,active
-license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
-valid_odoo_versions=16.0
+readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
+manifest-required-authors=Le Filament
+manifest-required-keys=license
+manifest-deprecated-keys=description,active
+license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
+valid-odoo-versions=16.0
[MESSAGES CONTROL]
disable=all
diff --git a/.ruff.toml b/.ruff.toml
new file mode 100644
index 0000000..0240c75
--- /dev/null
+++ b/.ruff.toml
@@ -0,0 +1,30 @@
+
+target-version = "py310"
+fix = true
+
+[lint]
+extend-select = [
+ "B",
+ "C90",
+ "E501", # line too long (default 88)
+ "I", # isort
+ "UP", # pyupgrade
+]
+exclude = ["setup/*"]
+
+[format]
+exclude = ["setup/*"]
+
+[per-file-ignores]
+"__init__.py" = ["F401", "I001"] # ignore unused and unsorted imports in __init__.py
+"__manifest__.py" = ["B018"] # useless expression
+
+[isort]
+section-order = ["future", "standard-library", "third-party", "odoo", "odoo-addons", "first-party", "local-folder"]
+
+[isort.sections]
+"odoo" = ["odoo"]
+"odoo-addons" = ["odoo.addons"]
+
+[mccabe]
+max-complexity = 16
diff --git a/views/hr_timesheet_view.xml b/views/hr_timesheet_view.xml
index e519c3c..b0ca8fd 100644
--- a/views/hr_timesheet_view.xml
+++ b/views/hr_timesheet_view.xml
@@ -8,6 +8,9 @@
<field name="model">account.analytic.line</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree" />
<field name="arch" type="xml">
+ <xpath expr="//tree" position="attributes">
+ <attribute name="editable">top</attribute>
+ </xpath>
<xpath expr="//field[@name='project_id']" position="attributes">
<attribute
name="options"
--
GitLab