Commit 326ffc3e authored by Alexis PASQUIER's avatar Alexis PASQUIER
Browse files

Merge branch 'v1.3.3' into 'master'

V1.3.3

See merge request !1
parents 83def4da 5df2d7f6
Pipeline #79634 passed with stages
in 2 minutes and 46 seconds
......@@ -129,4 +129,3 @@ dmypy.json
# Pyre type checker
.pyre/
include: https://gitlab.ndp-systemes.fr/odoo-addons/ci-files/-/raw/master/complete-python-libs.yml
variables:
SUPPORT_PYTHON_2: "True"
include:
- project: odoo-addons/ci-files
ref: v2
file: pipeline/python-lib.yml
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/quwac/pyproject-autoflake
rev: d09a6b9a9b9f0630c4e349e094d7b2cacb86e3ac
hooks:
- id: pautoflake
- repo: https://github.com/psf/black
rev: 22.1.0
rev: 22.6.0
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
rev: 5.7.0
rev: 5.10.1
hooks:
- id: isort
# - repo: https://github.com/flakehell/flakehell
# rev: v.0.9.0
# hooks:
# - id: flakehell
- repo: local
- repo: https://github.com/flakeheaven/flakeheaven
rev: 2.0.0
hooks:
- id: flakeheaven
- repo: https://github.com/asottile/setup-cfg-fmt
rev: v1.20.1
hooks:
- id: setup-cfg-fmt
- repo: https://gitlab.com/devopshq/gitlab-ci-linter
rev: v1.0.3
hooks:
- id: autoflake
name: autoflake
entry: pautoflake -i
language: system
always_run: true
pass_filenames: true
- id: flakehell
name: flakehell
entry: flakehell lint
language: system
always_run: true
pass_filenames: false
- id: gitlab-ci-linter
args:
- '--server'
- 'https://gitlab.ndp-systemes.fr'
# Use --insecure for self-signed certificate if you don't worry about security :)
# Or if you have a error: [SSL: CERTIFICATE_VERIFY_FAILED]
# - '--insecure'
# Set GITLAB_PRIVATE_TOKEN to a project access token with `api` scope as environment variable to authenticate on your own
# Gitlab server
# Requirements for
flakehell>=0.9.0
flake8-black>=0.3.2
flake8-isort>=4.1.1
flake8==3.9.0
black>=22.1.0
isort>=5.6.4
pre-commit>=2.17.0
pyproject-autoflake>=1.0.1
\ No newline at end of file
# Plugins flake8
......@@ -12,4 +12,4 @@
<orderEntry type="jdk" jdkName="Python 3.9" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
</module>
......@@ -42,7 +42,7 @@ def is_main_instance(env_vars):
class ToOdooArgs(ABC):
def to_odoo_args(self):
# type: () -> List[str]
...
pass
class OdooConfigFileRef(ToOdooArgs):
......@@ -50,7 +50,7 @@ class OdooConfigFileRef(ToOdooArgs):
self.odoo_rc = odoo_rc
def to_odoo_args(self):
return [f"--config={self.odoo_rc}"]
return ["--config=%s" % self.odoo_rc]
class OdooConfig(OdooConfigABC, Dictable, ToOdooArgs):
......
......@@ -7,10 +7,30 @@ skip_gitignore = true
skip = "__init__.py"
[tool.autoflake]
expand-star-imports = true # expand from module import *
ignore-init-module-imports = true # exclude __init__.py when removing unused imports
remove-duplicate-keys = true # remove all duplicate keys in objects
# return error code if changes are needed
check = false
# make changes to files instead of printing diffs
in-place = true
# drill down directories recursively
recursive = true
# exclude file/directory names that match these comma-separated globs
# exclude = "<GLOBS>"
# by default, only unused standard library imports are removed; specify a comma-separated list of additional
# modules/packages
# imports = "<IMPORTS>"
# expand wildcard star imports with undefined names; this only triggers if there is only one star import in
# the file; this is skipped if there are any uses of `__all__` or `del` in the file
expand-star-imports = true
# remove all unused imports (not just those from the standard library)
remove-all-unused-imports = true
# exclude __init__.py when removing unused imports
ignore-init-module-imports = true
# remove all duplicate keys in objects
remove-duplicate-keys = true
# remove unused variables
remove-unused-variables = true
# print more verbose logs (larger numbers are more verbose)
verbose = 3
[tool.flakehell]
base = "https://gitlab.ndp-systemes.fr/odoo-addons/ci-files/-/raw/master/jobs/.pre/base_flake_hell.toml"
[tool.flakeheaven]
base = "https://gitlab.ndp-systemes.fr/odoo-addons/ci-files/-/raw/master/jobs/.pre/base_flakeheaven.toml"
[metadata]
name = odoo_launcher
version = 1.3.2
version = 1.3.3
description = Create config compatible with Odoo
url = https://gitlab.ndp-systemes.fr/python-libs/odoo_launcher
license = GPLv3
author = Alexis Pasquier, NDP Systemes
author_email = opensource@ndp-systemes.fr
description = Create config compatible with Odoo
classifiers=
license = GPLv3
classifiers =
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
......@@ -15,12 +17,11 @@ classifiers=
Programming Language :: Python :: 3.10
[options]
python_requires = >=2.7, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*
include_package_data = True
packages = odoo_launcher
install_requires =
addons-installer>=1.4.1
maintenance-server>=1.2.1
typing==3.10.0.0;python_version<='3'
addons-installer>=1.4.1,<2
maintenance-server>=1.2.1,<2
enum34==1.1.10;python_version<='3'
typing==3.10.0.0;python_version<='3'
python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*
include_package_data = True
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment