From 468419fa9e23488b60907f19e4f5c5a9f21836dc Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Wed, 30 Mar 2022 23:20:27 +0200 Subject: [PATCH] [IMP] update dotfiles [ci skip] --- .copier-answers.yml | 5 ++++- .eslintrc.yml | 2 +- .github/workflows/pre-commit.yml | 29 ++++++++++++++++++++++------- .pre-commit-config.yaml | 3 ++- README.md | 6 +++--- 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index f15ee5d6c..dd58bb26d 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: https://github.com/OCA/oca-addons-repo-template.git ci: Travis dependency_installation_mode: OCA generate_requirements_txt: true include_wkhtmltopdf: true odoo_version: 13.0 +org_name: Odoo Community Association (OCA) +org_slug: OCA rebel_module_groups: [] repo_description: Odoo modules related to Manufacturing repo_name: Odoo Manufacturing Modules repo_slug: manufacture +repo_website: https://github.com/OCA/manufacture travis_apt_packages: [] travis_apt_sources: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index d4cc423cc..9429bc688 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 80ab1a211..dd4bfb258 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -2,7 +2,12 @@ name: pre-commit on: pull_request: + branches: + - "13.0*" push: + branches: + - "13.0" + - "13.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 997fce7dd..a8e50277e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ exclude: | # Files and folders generated by bots, to avoid loops ^setup/|/static/description/index\.html$| # We don't want to mess with tool-generated files - .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$| + .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/| # Maybe reactivate this when all README files include prettier ignore tags? ^README\.md$| # Library files can have extraneous formatting (even minimized) @@ -49,6 +49,7 @@ repos: rev: 19.10b0 hooks: - id: black + additional_dependencies: ["click<8.1.0"] - repo: https://github.com/pre-commit/mirrors-prettier rev: v1.19.1 hooks: diff --git a/README.md b/README.md index d48eaad37..57542b006 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat/129/13.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-manufacture-129) + +[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/manufacture&target_branch=13.0) [![Build Status](https://travis-ci.com/OCA/manufacture.svg?branch=13.0)](https://travis-ci.com/OCA/manufacture) [![codecov](https://codecov.io/gh/OCA/manufacture/branch/13.0/graph/badge.svg)](https://codecov.io/gh/OCA/manufacture) [![Translation Status](https://translation.odoo-community.org/widgets/manufacture-13-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/manufacture-13-0/?utm_source=widget) @@ -55,12 +56,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.