Skip to content

Commit

Permalink
[REF] pylint_odoo: Update pylint version and drop support for py38 (#…
Browse files Browse the repository at this point in the history
…515)

We are updating the pylint version used where drops support for python 3.8
  • Loading branch information
moylop260 committed Jan 16, 2025
1 parent 820ed41 commit 6e74596
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 23 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ['3.8', '3.9', '3.10', '3.11', '3.12']
python: ['3.9', '3.10', '3.11', '3.12']
os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
tox_env: ['py']
include:
Expand All @@ -56,8 +56,6 @@ jobs:
exclude:
# macos-14 AKA macos-latest has switched to being an ARM runner, only supporting newer versions of Python
# https://github.com/actions/setup-python/issues/825#issuecomment-2096792396
- python: '3.8'
os: macos-latest
- python: '3.9'
os: macos-latest
- python: '3.10'
Expand Down
7 changes: 3 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@ skip = .tox,.eggs,ci/templates,build,dist
# - can use as many you want

python_versions =
py27
py36
py37
py38
py39
py310
py311
py312
pypy
pypy3

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ def read(*names, **kwargs):
"Operating System :: Microsoft :: Windows",
"Operating System :: MacOS",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand All @@ -84,7 +83,7 @@ def read(*names, **kwargs):
keywords=[
# eg: 'keyword1', 'keyword2', 'keyword3',
],
python_requires=">=3.8",
python_requires=">=3.9",
install_requires=generate_dependencies(),
extras_require={
# eg:
Expand Down
2 changes: 1 addition & 1 deletion src/pre_commit_vauxoo/cfg/.pre-commit-config-optional.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ default_language_version:
node: "14.13.0"
repos:
- repo: https://github.com/OCA/pylint-odoo
rev: v9.2.0
rev: v9.3.2
hooks:
- id: pylint_odoo
name: pylint optional checks
Expand Down
3 changes: 2 additions & 1 deletion src/pre_commit_vauxoo/cfg/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ repos:
- id: flake8
name: flake8 mandatory checks
- repo: https://github.com/OCA/pylint-odoo
rev: v9.2.0
rev: v9.3.2
hooks:
- id: pylint_odoo
name: pylint mandatory checks
args:
- --rcfile=.pylintrc
# External scripts
- --disable=R0000
# uncomment after fix https://github.com/OCA/pylint-odoo/pull/512
Expand Down
4 changes: 3 additions & 1 deletion src/pre_commit_vauxoo/cfg/.pylintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[MASTER]
[MAIN]
ignore=CVS,.git,scenarios,LICENSE,*.md
persistent=yes
# This extension are not used for this configuration file but are useful to process disable comments based on these ones
Expand Down Expand Up @@ -116,6 +116,7 @@ disable=abstract-method,
resource-not-exist,
sql-injection,
# test-folder-imported,
too-many-positional-arguments,
translation-contains-variable,
translation-field,
translation-positional-used,
Expand Down Expand Up @@ -158,6 +159,7 @@ disable=abstract-method,
# ungrouped-imports: We uses a lot "from odoo import fields;from odoo.tools import ..." so it is a valid case for us
# duplicate-code: Enable after fix https://github.com/PyCQA/pylint/issues/214
# assignment-from-no-return: pylint doesn't have the full context of all modules even we could return the same
# useless-option-value: Raises error when a check doesn't exists but what about multi-compatibility

#***Enabled and how to fix***
#E1103 - maybe-no-member
Expand Down
5 changes: 1 addition & 4 deletions src/pre_commit_vauxoo/cfg/.pylintrc-optional
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[MASTER]
profile=no
[MAIN]
ignore=CVS,.git,scenarios,.bzr
persistent=yes
load-plugins=pylint.extensions.docstyle, pylint.extensions.mccabe, pylint_odoo
Expand Down Expand Up @@ -74,13 +73,11 @@ enable=attribute-deprecated,
use-symbolic-message-instead,
use-vim-comment,
useless-parent-delegation,
useless-option-value,
website-manifest-key-not-valid-uri

[REPORTS]
msg-template={path}:{line}:{column}: ({symbol}) {msg}
output-format=colorized
files-output=no
reports=no
evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
score=no
Expand Down
4 changes: 3 additions & 1 deletion src/pre_commit_vauxoo/hooks/check_deactivate_jinja.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@ def check_deactivate(fname_deactivate, instance_types=None):
# Return instead of continue because the package is not installed
return res
if not res:
only_msg = msg
sql_line_error = sql
error_re = re.search(r"^line (\d+): ([^/]+)", msg)
if error_re:
sql_lineno, only_msg = error_re.groups()
sql_lineno = int(sql_lineno)
sql_line_error = "\n".join(sql.splitlines()[sql_lineno - 1 : sql_lineno]) # noqa: E203
sql_line_error = "\n".join(sql.splitlines()[sql_lineno - 1 : sql_lineno])
print(
"%s->json->sql instance_type=%s - %s\n\t%s\nsql content:\n%s"
% (fname_deactivate, instance_type, only_msg, sql_line_error, sql)
Expand Down
13 changes: 8 additions & 5 deletions src/pre_commit_vauxoo/pre_commit_vauxoo.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,14 @@ def copy_cfg_files(
if fname == ".pre-commit-config-autofix.yaml" and exclude_autofix:
_logger.info("Applying EXCLUDE_AUTOFIX=%s to %s", exclude_autofix, dst)
line += " %s\n" % exclude_autofix_regex
if pylint_disable_checks and fname.startswith(".pre-commit-config") and "--disable=R0000" in line:
_logger.info(
"Disabling the following pylint checks (PYLINT_DISABLE_CHECKS): %s", pylint_disable_checks
)
line = line.replace("R0000", ",".join(pylint_disable_checks))
if fname.startswith(".pre-commit-config") and "--disable=R0000" in line:
if pylint_disable_checks:
_logger.info(
"Disabling the following pylint checks (PYLINT_DISABLE_CHECKS): %s", pylint_disable_checks
)
line = line.replace("R0000", ",".join(pylint_disable_checks))
else:
line = ""
if oca_hooks_disable_checks and fname.startswith(".oca_hooks.cfg") and "disable=" in line:
_logger.info(
"Disabling the following oca hooks checks (OCA_HOOKS_DISABLE_CHECKS): %s",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_pre_commit_vauxoo.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def setUp(self):

def create_dummy_repo(self, src_path, dest_path):
copy_tree(src_path, dest_path)
subprocess.check_call(["git", "init", dest_path])
subprocess.check_call(["git", "init", dest_path, "--initial-branch=main"])
# Notice we needed a previous os.chdir to repository directory
subprocess.check_call(["git", "add", "-A"])

Expand Down

0 comments on commit 6e74596

Please sign in to comment.