Skip to content

Commit

Permalink
[IMP] update dotfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
OCA-git-bot committed Oct 27, 2023
1 parent 9c30422 commit dd98c2b
Show file tree
Hide file tree
Showing 80 changed files with 3,762 additions and 1,894 deletions.
7 changes: 3 additions & 4 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.12.0
_commit: v1.17.2
_src_path: https://github.com/OCA/oca-addons-repo-template.git
ci: GitHub
dependency_installation_mode: OCA
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
Expand All @@ -18,6 +19,4 @@ repo_description: All-in-One Property Management System (PMS) focused on medium-
repo_name: Property Management System
repo_slug: pms
repo_website: https://github.com/OCA/pms
travis_apt_packages: []
travis_apt_sources: []

1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ on:

jobs:
pre-commit:
runs-on: ubuntu-latest
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
Expand All @@ -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)"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
name: Detect unreleased dependencies
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: |
for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then
Expand All @@ -28,18 +28,18 @@ jobs:
fi
done
test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: ${{ matrix.container }}
name: ${{ matrix.name }}
strategy:
fail-fast: false
matrix:
include:
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
makepot: "true"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
name: test with OCB
makepot: "true"
services:
postgres:
image: postgres:9.6
Expand All @@ -50,7 +50,7 @@ jobs:
ports:
- 5432:5432
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
persist-credentials: false
- name: Install addons and dependencies
Expand Down
18 changes: 16 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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/pms"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --org-name=OCA
- --repo-name=pms
- --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:
Expand Down Expand Up @@ -101,7 +115,7 @@ repos:
- id: pyupgrade
args: ["--keep-percent-format"]
- repo: https://github.com/PyCQA/isort
rev: 5.5.1
rev: 5.12.0
hooks:
- id: isort
name: isort except __init__.py
Expand Down
9 changes: 6 additions & 3 deletions get-pip.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,20 @@
message_parts = [
"This script does not work on Python {}.{}".format(*this_python),
"The minimum supported Python version is {}.{}.".format(*min_version),
"Please use https://bootstrap.pypa.io/pip/{}.{}/get-pip.py instead.".format(*this_python),
"Please use https://bootstrap.pypa.io/pip/{}.{}/get-pip.py instead.".format(
*this_python
),
]
print("ERROR: " + " ".join(message_parts))
sys.exit(1)


import argparse
import importlib
import os.path
import pkgutil
import shutil
import tempfile
import argparse
import importlib
from base64 import b85decode


Expand Down Expand Up @@ -113,6 +115,7 @@ def bootstrap(tmpdir):
# Execute the included pip and use it to install the latest pip and
# setuptools from PyPI
from pip._internal.cli.main import main as pip_entry_point

args = determine_pip_install_arguments()
sys.exit(pip_entry_point(args))

Expand Down
18 changes: 14 additions & 4 deletions pms/controllers/pms_portal.py
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ def portal_precheckin_folio(self, folio_id, access_token=None, **kw):
)
except (AccessError, MissingError):
return request.redirect("/my")
values.update({"no_breadcrumbs": True,"folio": folio_sudo})
values.update({"no_breadcrumbs": True, "folio": folio_sudo})
return request.render("pms.portal_my_prechekin_folio", values)

@http.route(
Expand All @@ -391,12 +391,20 @@ def portal_precheckin_folio(self, folio_id, access_token=None, **kw):
website=True,
csrf=False,
)
def portal_precheckin_reservation(self, folio_id, reservation_id, access_token=None, **kw):
def portal_precheckin_reservation(
self, folio_id, reservation_id, access_token=None, **kw
):
folio = request.env["pms.folio"].sudo().browse(folio_id)
reservation = request.env["pms.reservation"].sudo().browse(reservation_id)
values = {}
values.update({"folio": folio})
values.update({"no_breadcrumbs": True,"folio_access_token": access_token, "reservation": reservation})
values.update(
{
"no_breadcrumbs": True,
"folio_access_token": access_token,
"reservation": reservation,
}
)
return request.render("pms.portal_my_prechekin_reservation", values)

@http.route(
Expand All @@ -408,7 +416,9 @@ def portal_precheckin_reservation(self, folio_id, reservation_id, access_token=N
website=True,
csrf=False,
)
def portal_precheckin(self, folio_id, reservation_id, checkin_partner_id, access_token=None, **kw):
def portal_precheckin(
self, folio_id, reservation_id, checkin_partner_id, access_token=None, **kw
):
folio = request.env["pms.folio"].sudo().browse(folio_id)
reservation = request.env["pms.reservation"].sudo().browse(reservation_id)
try:
Expand Down
6 changes: 3 additions & 3 deletions pms/data/pms_data.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@
<record id="main_pms_sale_channel_door" model="pms.sale.channel">
<field name="name">Door</field>
<field name="channel_type">direct</field>
<field name="icon" type="base64" file="pms/data/icon-door.svg"/>
<field name="icon" type="base64" file="pms/data/icon-door.svg" />
</record>
<record id="main_pms_sale_channel_phone" model="pms.sale.channel">
<field name="name">Phone</field>
<field name="channel_type">direct</field>
<field name="icon" type="base64" file="pms/data/icon-phone.svg"/>
<field name="icon" type="base64" file="pms/data/icon-phone.svg" />
</record>
<record id="main_pms_sale_channel_mail" model="pms.sale.channel">
<field name="name">Mail</field>
<field name="channel_type">direct</field>
<field name="icon" type="base64" file="pms/data/icon-mail.svg"/>
<field name="icon" type="base64" file="pms/data/icon-mail.svg" />
</record>
<record id="main_pms_sale_channel_agency" model="pms.sale.channel">
<field name="name">Agency</field>
Expand Down
Loading

0 comments on commit dd98c2b

Please sign in to comment.