[IMP] update dotfiles [ci skip]

This commit is contained in:
oca-git-bot 2022-03-31 17:38:31 +02:00
parent 99e5708c1d
commit ae5e594b1f
No known key found for this signature in database
GPG Key ID: BCAB2555446B5B92
8 changed files with 41 additions and 23 deletions

View File

@ -1,14 +1,17 @@
# Do NOT update manually; changes here will be overwritten by Copier # 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 _src_path: gh:oca/oca-addons-repo-template
ci: Travis ci: Travis
dependency_installation_mode: PIP dependency_installation_mode: PIP
generate_requirements_txt: true generate_requirements_txt: true
include_wkhtmltopdf: false include_wkhtmltopdf: false
odoo_version: 14.0 odoo_version: 14.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
rebel_module_groups: [] rebel_module_groups: []
repo_description: null repo_description: null
repo_name: server-env repo_name: server-env
repo_slug: server-env repo_slug: server-env
repo_website: https://github.com/OCA/server-env
travis_apt_packages: [] travis_apt_packages: []
travis_apt_sources: [] travis_apt_sources: []

View File

@ -4,7 +4,7 @@ env:
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449 # See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
parserOptions: parserOptions:
ecmaVersion: 2017 ecmaVersion: 2019
overrides: overrides:
- files: - files:

View File

@ -2,7 +2,12 @@ name: pre-commit
on: on:
pull_request: pull_request:
branches:
- "14.0*"
push: push:
branches:
- "14.0"
- "14.0-ocabot-*"
jobs: jobs:
pre-commit: pre-commit:
@ -10,11 +15,21 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-python@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: with:
# The pylint-odoo version we use here does not support python 3.10 path: ~/.cache/pre-commit
# https://github.com/OCA/oca-addons-repo-template/issues/80 key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
# We also need to pin to an older version of python for older odoo versions - name: Install pre-commit
# where we are not using black > 21. Older black versions won't work with run: pip install pre-commit
# Python 3.9.8+, and we can't bump black without reformatting. - name: Run pre-commit
python-version: "3.9.7" run: pre-commit run --all-files --show-diff-on-failure --color=always
- uses: pre-commit/action@v2.0.0 - 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

View File

@ -48,7 +48,7 @@ repos:
- --remove-duplicate-keys - --remove-duplicate-keys
- --remove-unused-variables - --remove-unused-variables
- repo: https://github.com/psf/black - repo: https://github.com/psf/black
rev: 20.8b1 rev: 22.3.0
hooks: hooks:
- id: black - id: black
- repo: https://github.com/pre-commit/mirrors-prettier - repo: https://github.com/pre-commit/mirrors-prettier
@ -122,7 +122,7 @@ repos:
name: flake8 name: flake8
additional_dependencies: ["flake8-bugbear==20.1.4"] additional_dependencies: ["flake8-bugbear==20.1.4"]
- repo: https://github.com/PyCQA/pylint - repo: https://github.com/PyCQA/pylint
rev: pylint-2.5.3 rev: v2.11.1
hooks: hooks:
- id: pylint - id: pylint
name: pylint with optional checks name: pylint with optional checks
@ -131,7 +131,7 @@ repos:
- --exit-zero - --exit-zero
verbose: true verbose: true
additional_dependencies: &pylint_deps additional_dependencies: &pylint_deps
- pylint-odoo==3.5.0 - pylint-odoo==5.0.5
- id: pylint - id: pylint
name: pylint with mandatory checks name: pylint with mandatory checks
args: args:

View File

@ -1,4 +1,5 @@
[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat/254/14.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-server-env-254)
[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/server-env&target_branch=14.0)
[![Build Status](https://travis-ci.com/OCA/server-env.svg?branch=14.0)](https://travis-ci.com/OCA/server-env) [![Build Status](https://travis-ci.com/OCA/server-env.svg?branch=14.0)](https://travis-ci.com/OCA/server-env)
[![codecov](https://codecov.io/gh/OCA/server-env/branch/14.0/graph/badge.svg)](https://codecov.io/gh/OCA/server-env) [![codecov](https://codecov.io/gh/OCA/server-env/branch/14.0/graph/badge.svg)](https://codecov.io/gh/OCA/server-env)
[![Translation Status](https://translation.odoo-community.org/widgets/server-env-14-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/server-env-14-0/?utm_source=widget) [![Translation Status](https://translation.odoo-community.org/widgets/server-env-14-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/server-env-14-0/?utm_source=widget)
@ -35,12 +36,11 @@ addon | version | maintainers | summary
This repository is licensed under [AGPL-3.0](LICENSE). 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 policy. Consult each module's `__manifest__.py` file, which contains a `license` key
that explains its license. that explains its license.
---- ----
OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit
organization whose mission is to support the collaborative development of Odoo features organization whose mission is to support the collaborative development of Odoo features
and promote its widespread use. and promote its widespread use.

View File

@ -213,7 +213,7 @@ class ServerConfiguration(models.TransientModel):
@classmethod @classmethod
def _get_base_cols(cls): def _get_base_cols(cls):
""" Compute base fields""" """Compute base fields"""
res = {} res = {}
for col, item in list(system_base_config.options.items()): for col, item in list(system_base_config.options.items()):
key = cls._format_key("odoo", col) key = cls._format_key("odoo", col)
@ -222,7 +222,7 @@ class ServerConfiguration(models.TransientModel):
@classmethod @classmethod
def _get_env_cols(cls, sections=None): def _get_env_cols(cls, sections=None):
""" Compute base fields""" """Compute base fields"""
res = {} res = {}
sections = sections if sections else serv_config.sections() sections = sections if sections else serv_config.sections()
for section in sections: for section in sections:
@ -233,7 +233,7 @@ class ServerConfiguration(models.TransientModel):
@classmethod @classmethod
def _get_system_cols(cls): def _get_system_cols(cls):
""" Compute system fields""" """Compute system fields"""
res = {} res = {}
for col, item in get_server_environment(): for col, item in get_server_environment():
key = cls._format_key("system", col) key = cls._format_key("system", col)

View File

@ -16,7 +16,7 @@ class ServerEnvMixin(models.AbstractModel):
_inherit = "server.env.mixin" _inherit = "server.env.mixin"
def _compute_server_env_from_default(self, field_name, options): def _compute_server_env_from_default(self, field_name, options):
""" First return database encrypted value then default value """ """First return database encrypted value then default value"""
self.ensure_one() self.ensure_one()
encrypted_data_name = "{},{}".format(self._name, self.id) encrypted_data_name = "{},{}".format(self._name, self.id)
env = self.env.context.get("environment", None) env = self.env.context.get("environment", None)

View File

@ -30,7 +30,7 @@ class TestEnv(ServerEnvironmentCase):
) )
def test_get_param(self): def test_get_param(self):
""" Get system parameter from config """ """Get system parameter from config"""
with self.load_config( with self.load_config(
public=self.env_config, serv_config_class=ir_config_parameter public=self.env_config, serv_config_class=ir_config_parameter
): ):
@ -46,7 +46,7 @@ class TestEnv(ServerEnvironmentCase):
self.assertEqual(res.value, "config_value") self.assertEqual(res.value, "config_value")
def test_set_param_1(self): def test_set_param_1(self):
""" We can't set parameters that are in config file """ """We can't set parameters that are in config file"""
with self.load_config( with self.load_config(
public=self.env_config, serv_config_class=ir_config_parameter public=self.env_config, serv_config_class=ir_config_parameter
): ):
@ -73,7 +73,7 @@ class TestEnv(ServerEnvironmentCase):
self.assertEqual(len(res), 1) self.assertEqual(len(res), 1)
def test_set_param_2(self): def test_set_param_2(self):
""" We can set parameters that are not in config file """ """We can set parameters that are not in config file"""
with self.load_config( with self.load_config(
public=self.env_config, serv_config_class=ir_config_parameter public=self.env_config, serv_config_class=ir_config_parameter
): ):
@ -85,7 +85,7 @@ class TestEnv(ServerEnvironmentCase):
self.assertFalse(res) self.assertFalse(res)
def test_empty(self): def test_empty(self):
""" Empty config values cause error """ """Empty config values cause error"""
with self.load_config( with self.load_config(
public=self.env_config, serv_config_class=ir_config_parameter public=self.env_config, serv_config_class=ir_config_parameter
): ):