From 89dfc5a99990f177c363cbb40f7a3b2c77b940c6 Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Fri, 27 Oct 2023 21:35:46 +0200 Subject: [PATCH] [IMP] update dotfiles --- .copier-answers.yml | 8 +--- .eslintrc.yml | 1 + .github/workflows/pre-commit.yml | 13 ++++- .pre-commit-config.yaml | 16 ++++++- hotel_reservation/models/hotel_reservation.py | 2 +- hotel_reservation/models/hotel_room.py | 47 ++++++++++++------- 6 files changed, 60 insertions(+), 27 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index f05f23017..391def133 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,16 +1,12 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.14.2 +_commit: v1.17.2 _src_path: gh:oca/oca-addons-repo-template ci: Travis dependency_installation_mode: PIP generate_requirements_txt: true -github_check_license: true -github_ci_extra_env: {} -github_enable_codecov: true -github_enable_makepot: true github_enable_stale_action: true -github_enforce_dev_status_compatibility: true include_wkhtmltopdf: false +odoo_test_flavor: Both odoo_version: 14.0 org_name: Odoo Community Association (OCA) org_slug: OCA diff --git a/.eslintrc.yml b/.eslintrc.yml index 9429bc688..fed88d70d 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/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 755f8a225..602ecbca2 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,8 +13,10 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 + with: + python-version: "3.11" - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - uses: actions/cache@v1 @@ -25,6 +27,15 @@ jobs: run: pip install pre-commit - name: Run pre-commit run: pre-commit run --all-files --show-diff-on-failure --color=always + env: + # Consider valid a PR that changes README fragments but doesn't + # change the README.rst file itself. It's not really a problem + # because the bot will update it anyway after merge. This way, we + # lower the barrier for functional contributors that want to fix the + # readme fragments, while still letting developers get README + # auto-generated (which also helps functionals when using runboat). + # DOCS https://pre-commit.com/#temporarily-disabling-hooks + SKIP: oca-gen-addon-readme - name: Check that all files generated by pre-commit are in git run: | newfiles="$(git ls-files --others --exclude-from=.gitignore)" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index effdfd5df..65fddc71f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,6 +12,8 @@ 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)$| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: @@ -33,12 +35,24 @@ repos: language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/oca/maintainer-tools - rev: ab1d7f6 + rev: 969238e47c07d0c40573acff81d170f63245d738 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons - id: oca-fix-manifest-website args: ["https://github.com/OCA/vertical-hotel"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=14.0 + - --org-name=OCA + - --repo-name=vertical-hotel + - --if-source-changed + - repo: https://github.com/OCA/odoo-pre-commit-hooks + rev: v0.0.25 + hooks: + - id: oca-checks-odoo-module + - id: oca-checks-po - repo: https://github.com/myint/autoflake rev: v1.4 hooks: diff --git a/hotel_reservation/models/hotel_reservation.py b/hotel_reservation/models/hotel_reservation.py index dfdc1682b..383e5c77c 100644 --- a/hotel_reservation/models/hotel_reservation.py +++ b/hotel_reservation/models/hotel_reservation.py @@ -352,7 +352,7 @@ def set_to_draft_reservation(self): self.folio_id = [] self.update({"state": "draft"}) self.create_folio() - + def action_send_reservation_mail(self): """ This function opens a window to compose an email, diff --git a/hotel_reservation/models/hotel_room.py b/hotel_reservation/models/hotel_room.py index fc13e15ce..2a45bb954 100644 --- a/hotel_reservation/models/hotel_room.py +++ b/hotel_reservation/models/hotel_room.py @@ -182,12 +182,11 @@ def get_room_summary(self): # noqa C901 (function is too complex) ) chk_date = c.strftime(dt) - - reservline_ids = self.env['hotel.reservation'].search( + reservline_ids = self.env["hotel.reservation"].search( [ ("checkin", "<=", chk_date), ("checkout", ">=", chk_date), - ("state", "=", "draft") + ("state", "=", "draft"), ] ) for reservation in reservline_ids: @@ -196,15 +195,15 @@ def get_room_summary(self): # noqa C901 (function is too complex) ): # room_list_stats.append({"is_draft": "Yes"}) room_list_stats.append( - { - "state": "Reserved", - "date": chk_date, - "room_id": room.id, - "is_draft": "Yes", - "data_model": "", - "data_id": 0, - } - ) + { + "state": "Reserved", + "date": chk_date, + "room_id": room.id, + "is_draft": "Yes", + "data_model": "", + "data_id": 0, + } + ) else: for chk_date in date_range_list: ch_dt = chk_date[:10] + " 23:59:59" @@ -246,10 +245,22 @@ def get_room_summary(self): # noqa C901 (function is too complex) cidst = datetime.strftime(cid, dt) codst = datetime.strftime(cod, dt) rm_id = res_room.room_id.id - ci = rlist.get("date") and rlist.get("date") >= cidst - co = rlist.get("date") and rlist.get("date") <= codst - rm = rlist.get("room_id") and rlist.get("room_id") == rm_id - st = rlist.get("state") and rlist.get("state") == "Reserved" + ci = ( + rlist.get("date") + and rlist.get("date") >= cidst + ) + co = ( + rlist.get("date") + and rlist.get("date") <= codst + ) + rm = ( + rlist.get("room_id") + and rlist.get("room_id") == rm_id + ) + st = ( + rlist.get("state") + and rlist.get("state") == "Reserved" + ) if ci and co and rm and st: count += 1 if count - dur.days == 0: @@ -304,11 +315,11 @@ def get_room_summary(self): # noqa C901 (function is too complex) } ) else: - reservline_ids = self.env['hotel.reservation'].search( + reservline_ids = self.env["hotel.reservation"].search( [ ("checkin", "<=", chk_date), ("checkout", ">=", chk_date), - ("state", "=", "draft") + ("state", "=", "draft"), ] ) for reservation in reservline_ids: