diff --git a/.copier-answers.yml b/.copier-answers.yml index 984f61b..515e009 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,14 +1,17 @@ # 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: null repo_name: server-env repo_slug: server-env +repo_website: https://github.com/OCA/server-env travis_apt_packages: [] travis_apt_sources: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index d4cc423..9429bc6 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -4,7 +4,7 @@ env: # See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449 parserOptions: - ecmaVersion: 2017 + ecmaVersion: 2019 overrides: - files: diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 80ab1a2..a7a1390 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f143978..f336408 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -48,7 +48,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 @@ -122,7 +122,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 @@ -131,7 +131,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: diff --git a/README.md b/README.md index 5af6b4d..12d3bda 100644 --- a/README.md +++ b/README.md @@ -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) [![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) @@ -35,12 +36,11 @@ addon | version | maintainers | summary 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. ---- - 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 and promote its widespread use. diff --git a/server_environment/server_env.py b/server_environment/server_env.py index d291609..ef89a79 100644 --- a/server_environment/server_env.py +++ b/server_environment/server_env.py @@ -213,7 +213,7 @@ class ServerConfiguration(models.TransientModel): @classmethod def _get_base_cols(cls): - """ Compute base fields""" + """Compute base fields""" res = {} for col, item in list(system_base_config.options.items()): key = cls._format_key("odoo", col) @@ -222,7 +222,7 @@ class ServerConfiguration(models.TransientModel): @classmethod def _get_env_cols(cls, sections=None): - """ Compute base fields""" + """Compute base fields""" res = {} sections = sections if sections else serv_config.sections() for section in sections: @@ -233,7 +233,7 @@ class ServerConfiguration(models.TransientModel): @classmethod def _get_system_cols(cls): - """ Compute system fields""" + """Compute system fields""" res = {} for col, item in get_server_environment(): key = cls._format_key("system", col) diff --git a/server_environment_data_encryption/models/server_env_mixin.py b/server_environment_data_encryption/models/server_env_mixin.py index e4d8a04..477e3cb 100644 --- a/server_environment_data_encryption/models/server_env_mixin.py +++ b/server_environment_data_encryption/models/server_env_mixin.py @@ -16,7 +16,7 @@ class ServerEnvMixin(models.AbstractModel): _inherit = "server.env.mixin" 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() encrypted_data_name = "{},{}".format(self._name, self.id) env = self.env.context.get("environment", None) diff --git a/server_environment_ir_config_parameter/tests/test_server_environment_ircp.py b/server_environment_ir_config_parameter/tests/test_server_environment_ircp.py index b8a0337..ba5bb1b 100644 --- a/server_environment_ir_config_parameter/tests/test_server_environment_ircp.py +++ b/server_environment_ir_config_parameter/tests/test_server_environment_ircp.py @@ -30,7 +30,7 @@ class TestEnv(ServerEnvironmentCase): ) def test_get_param(self): - """ Get system parameter from config """ + """Get system parameter from config""" with self.load_config( public=self.env_config, serv_config_class=ir_config_parameter ): @@ -46,7 +46,7 @@ class TestEnv(ServerEnvironmentCase): self.assertEqual(res.value, "config_value") 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( public=self.env_config, serv_config_class=ir_config_parameter ): @@ -73,7 +73,7 @@ class TestEnv(ServerEnvironmentCase): self.assertEqual(len(res), 1) 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( public=self.env_config, serv_config_class=ir_config_parameter ): @@ -85,7 +85,7 @@ class TestEnv(ServerEnvironmentCase): self.assertFalse(res) def test_empty(self): - """ Empty config values cause error """ + """Empty config values cause error""" with self.load_config( public=self.env_config, serv_config_class=ir_config_parameter ):