mirror of https://github.com/OCA/web.git
[IMP] update dotfiles
parent
f790de2a50
commit
60f71c5b51
|
@ -1,16 +1,19 @@
|
|||
# Do NOT update manually; changes here will be overwritten by Copier
|
||||
_commit: v1.3.6
|
||||
_commit: v1.5.2
|
||||
_src_path: gh:oca/oca-addons-repo-template
|
||||
ci: Travis
|
||||
dependency_installation_mode: PIP
|
||||
generate_requirements_txt: true
|
||||
include_wkhtmltopdf: false
|
||||
odoo_version: 14.0
|
||||
org_name: Odoo Community Association (OCA)
|
||||
org_slug: OCA
|
||||
rebel_module_groups: []
|
||||
repo_description: "This project aims to deal with modules related to the webclient\
|
||||
\ of Odoo. You'll find modules that:\n\n - Add facilities to the UI\n - Add widgets\n\
|
||||
\ - Ease the import/export features\n - Generally add clientside functionality"
|
||||
repo_name: Web addons for Odoo
|
||||
repo_slug: web
|
||||
repo_website: https://github.com/OCA/web
|
||||
travis_apt_packages: []
|
||||
travis_apt_sources: []
|
||||
|
|
|
@ -4,7 +4,7 @@ env:
|
|||
|
||||
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
|
||||
parserOptions:
|
||||
ecmaVersion: 2017
|
||||
ecmaVersion: 2019
|
||||
|
||||
overrides:
|
||||
- files:
|
||||
|
|
|
@ -2,7 +2,12 @@ name: pre-commit
|
|||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- "14.0*"
|
||||
push:
|
||||
branches:
|
||||
- "14.0"
|
||||
- "14.0-ocabot-*"
|
||||
|
||||
jobs:
|
||||
pre-commit:
|
||||
|
@ -10,11 +15,21 @@ jobs:
|
|||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-python@v2
|
||||
- name: Get python version
|
||||
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
|
||||
- uses: actions/cache@v1
|
||||
with:
|
||||
# The pylint-odoo version we use here does not support python 3.10
|
||||
# https://github.com/OCA/oca-addons-repo-template/issues/80
|
||||
# We also need to pin to an older version of python for older odoo versions
|
||||
# where we are not using black > 21. Older black versions won't work with
|
||||
# Python 3.9.8+, and we can't bump black without reformatting.
|
||||
python-version: "3.9.7"
|
||||
- uses: pre-commit/action@v2.0.0
|
||||
path: ~/.cache/pre-commit
|
||||
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
||||
- name: Install pre-commit
|
||||
run: pip install pre-commit
|
||||
- name: Run pre-commit
|
||||
run: pre-commit run --all-files --show-diff-on-failure --color=always
|
||||
- name: Check that all files generated by pre-commit are in git
|
||||
run: |
|
||||
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
|
||||
if [ "$newfiles" != "" ] ; then
|
||||
echo "Please check-in the following files:"
|
||||
echo "$newfiles"
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
@ -46,7 +46,7 @@ repos:
|
|||
- --remove-duplicate-keys
|
||||
- --remove-unused-variables
|
||||
- repo: https://github.com/psf/black
|
||||
rev: 20.8b1
|
||||
rev: 22.3.0
|
||||
hooks:
|
||||
- id: black
|
||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
||||
|
@ -120,7 +120,7 @@ repos:
|
|||
name: flake8
|
||||
additional_dependencies: ["flake8-bugbear==20.1.4"]
|
||||
- repo: https://github.com/PyCQA/pylint
|
||||
rev: pylint-2.5.3
|
||||
rev: v2.11.1
|
||||
hooks:
|
||||
- id: pylint
|
||||
name: pylint with optional checks
|
||||
|
@ -129,7 +129,7 @@ repos:
|
|||
- --exit-zero
|
||||
verbose: true
|
||||
additional_dependencies: &pylint_deps
|
||||
- pylint-odoo==3.5.0
|
||||
- pylint-odoo==5.0.5
|
||||
- id: pylint
|
||||
name: pylint with mandatory checks
|
||||
args:
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
[](https://runbot.odoo-community.org/runbot/repo/github-com-oca-web-162)
|
||||
|
||||
[](https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=14.0)
|
||||
[](https://travis-ci.com/OCA/web)
|
||||
[](https://codecov.io/gh/OCA/web)
|
||||
[](https://translation.odoo-community.org/engage/web-14-0/?utm_source=widget)
|
||||
|
@ -82,7 +83,7 @@ addon | version | maintainers | summary
|
|||
## Licenses
|
||||
This repository is licensed under [AGPL-3.0](LICENSE).
|
||||
|
||||
However, each module can have a totally different license, as long as they adhere to OCA
|
||||
However, each module can have a totally different license, as long as they adhere to Odoo Community Association (OCA)
|
||||
policy. Consult each module's `__manifest__.py` file, which contains a `license` key
|
||||
that explains its license.
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ from odoo import exceptions, models
|
|||
|
||||
|
||||
class Base(models.AbstractModel):
|
||||
""" The base model, which is implicitly inherited by all models. """
|
||||
"""The base model, which is implicitly inherited by all models."""
|
||||
|
||||
_inherit = "base"
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ from odoo.addons.base.models.assetsbundle import AssetsBundle, ScssStylesheetAss
|
|||
|
||||
class AssetsBundleCompanyColor(AssetsBundle):
|
||||
def get_company_color_asset_node(self):
|
||||
""" Process the user active company scss and returns the node to inject """
|
||||
"""Process the user active company scss and returns the node to inject"""
|
||||
company_id = self.env["res.company"].browse(
|
||||
self.env.context.get("active_company_id", 0)
|
||||
)
|
||||
|
|
|
@ -64,7 +64,7 @@ class QWeb(models.AbstractModel):
|
|||
|
||||
@api.model
|
||||
def _render(self, id_or_xml_id, values=None, **options):
|
||||
""" Adds the active company to the context """
|
||||
"""Adds the active company to the context"""
|
||||
try:
|
||||
active_company_id = int(
|
||||
request.httprequest.cookies.get("cids", "").split(",")[0]
|
||||
|
@ -79,7 +79,7 @@ class QWeb(models.AbstractModel):
|
|||
return super()._render(id_or_xml_id, values=values, **options)
|
||||
|
||||
def _get_asset_content(self, xmlid, options):
|
||||
""" Handle 'special' web_company_color xmlid """
|
||||
"""Handle 'special' web_company_color xmlid"""
|
||||
if xmlid == "web_company_color.company_color_assets":
|
||||
asset = AssetsBundleCompanyColor(xmlid, [], env=self.env)
|
||||
return ([], [asset.get_company_color_asset_node()])
|
||||
|
|
Loading…
Reference in New Issue