Merge PR #2384 into 13.0

Signed-off-by sbidoul
pull/1972/merge
OCA-git-bot 2023-01-09 16:45:25 +00:00
commit 0bad4fd3b9
9 changed files with 39 additions and 10 deletions

View File

@ -1,9 +1,15 @@
# Do NOT update manually; changes here will be overwritten by Copier # Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.6.1 _commit: v1.14.0
_src_path: https://github.com/OCA/oca-addons-repo-template.git _src_path: https://github.com/OCA/oca-addons-repo-template.git
ci: GitHub ci: GitHub
dependency_installation_mode: PIP dependency_installation_mode: PIP
generate_requirements_txt: true generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
github_enable_codecov: true
github_enable_makepot: true
github_enable_stale_action: true
github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: false include_wkhtmltopdf: false
odoo_version: 13.0 odoo_version: 13.0
org_name: Odoo Community Association (OCA) org_name: Odoo Community Association (OCA)
@ -16,3 +22,4 @@ repo_slug: web
repo_website: https://github.com/OCA/web repo_website: https://github.com/OCA/web
travis_apt_packages: [] travis_apt_packages: []
travis_apt_sources: [] travis_apt_sources: []

View File

@ -11,7 +11,7 @@ on:
jobs: jobs:
pre-commit: pre-commit:
runs-on: ubuntu-latest runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2

View File

@ -28,7 +28,7 @@ jobs:
fi fi
done done
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-20.04
container: ${{ matrix.container }} container: ${{ matrix.container }}
name: ${{ matrix.name }} name: ${{ matrix.name }}
strategy: strategy:

1
.gitignore vendored
View File

@ -15,7 +15,6 @@ build/
develop-eggs/ develop-eggs/
dist/ dist/
eggs/ eggs/
lib/
lib64/ lib64/
parts/ parts/
sdist/ sdist/

View File

@ -27,6 +27,11 @@ repos:
entry: found forbidden files; remove them entry: found forbidden files; remove them
language: fail language: fail
files: "\\.rej$" files: "\\.rej$"
- id: en-po-files
name: en.po files cannot exist
entry: found a en.po file
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools - repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6 rev: ab1d7f6
hooks: hooks:
@ -102,10 +107,16 @@ repos:
name: isort except __init__.py name: isort except __init__.py
exclude: /__init__\.py$ exclude: /__init__\.py$
- repo: https://github.com/acsone/setuptools-odoo - repo: https://github.com/acsone/setuptools-odoo
rev: 2.5.2 rev: 3.1.8
hooks: hooks:
- id: setuptools-odoo-make-default - id: setuptools-odoo-make-default
- repo: https://gitlab.com/pycqa/flake8 - id: setuptools-odoo-get-requirements
args:
- --output
- requirements.txt
- --header
- "# generated from manifests external_dependencies"
- repo: https://github.com/PyCQA/flake8
rev: 3.7.9 rev: 3.7.9
hooks: hooks:
- id: flake8 - id: flake8

View File

@ -1,3 +1,5 @@
[MASTER] [MASTER]
load-plugins=pylint_odoo load-plugins=pylint_odoo
score=n score=n

View File

@ -1,3 +1,4 @@
[MASTER] [MASTER]
load-plugins=pylint_odoo load-plugins=pylint_odoo
score=n score=n

View File

@ -1,6 +1,5 @@
# web_widget_bokeh_chart # generated from manifests external_dependencies
bokeh==1.1.0 bokeh==1.1.0
# web_widget_mpld3_chart
matplotlib==3.0.3; python_version < '3.7' matplotlib==3.0.3; python_version < '3.7'
matplotlib==3.4.1; python_version >= '3.7' matplotlib==3.4.1; python_version >= '3.7'
mpld3==0.3 mpld3==0.3

View File

@ -2,5 +2,15 @@ import setuptools
setuptools.setup( setuptools.setup(
setup_requires=['setuptools-odoo'], setup_requires=['setuptools-odoo'],
odoo_addon=True, odoo_addon={
"external_dependencies_override": {
"python": {
"mpld3": [
"matplotlib==3.0.3; python_version < '3.7'",
"matplotlib==3.4.1; python_version >= '3.7'",
"mpld3==0.3",
],
},
},
},
) )