diff --git a/.copier-answers.yml b/.copier-answers.yml index f8f7b8d9..35c39c73 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,13 +1,13 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.0.3 -_src_path: gh:oca/oca-addons-repo-template +_commit: v1.1.1 +_src_path: https://github.com/OCA/oca-addons-repo-template.git dependency_installation_mode: PIP -generate_requirements_txt: true -include_wkhtmltopdf: false +generate_requirements_txt: false +include_wkhtmltopdf: true odoo_version: 14.0 rebel_module_groups: [] repo_description: "TODO: add repo description." -repo_name: account-budgeting -repo_slug: account-budgeting +repo_name: stock-rma +repo_slug: https://github.com/ForgeFlow/stock-rma travis_apt_packages: [] travis_apt_sources: [] diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml new file mode 100644 index 00000000..335381cb --- /dev/null +++ b/.github/workflows/pre-commit.yml @@ -0,0 +1,13 @@ +name: pre-commit + +on: + pull_request: + push: + +jobs: + pre-commit: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + - uses: pre-commit/action@v2.0.0 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0a1fd71a..db6de111 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,6 +4,8 @@ exclude: | # END NOT INSTALLABLE ADDONS # 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$| # Maybe reactivate this when all README files include prettier ignore tags? ^README\.md$| # Library files can have extraneous formatting (even minimized) @@ -26,12 +28,12 @@ repos: language: fail files: "\\.rej$" - repo: https://github.com/oca/maintainer-tools - rev: 1b5c7ad + rev: ab1d7f6 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons - id: oca-fix-manifest-website - args: ["https://github.com/OCA/account-budgeting"] + args: ["https://github.com/OCA/https://github.com/ForgeFlow/stock-rma"] - repo: https://github.com/myint/autoflake rev: v1.4 hooks: @@ -41,7 +43,7 @@ repos: rev: 20.8b1 hooks: - id: black - - repo: https://github.com/prettier/pre-commit + - repo: https://github.com/pre-commit/mirrors-prettier rev: v2.1.2 hooks: - id: prettier @@ -97,12 +99,6 @@ repos: rev: 2.6.0 hooks: - id: setuptools-odoo-make-default - - id: setuptools-odoo-get-requirements - args: - - --output - - requirements.txt - - --header - - "# generated from manifests external_dependencies" - repo: https://gitlab.com/PyCQA/flake8 rev: 3.8.3 hooks: diff --git a/.pylintrc b/.pylintrc index e3395883..e3c5b8e3 100644 --- a/.pylintrc +++ b/.pylintrc @@ -39,7 +39,6 @@ enable=anomalous-backslash-in-string, license-allowed, manifest-author-string, manifest-deprecated-key, - manifest-required-author, manifest-required-key, manifest-version-format, method-compute, diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory index 08bca3ce..0d440de1 100644 --- a/.pylintrc-mandatory +++ b/.pylintrc-mandatory @@ -32,7 +32,6 @@ enable=anomalous-backslash-in-string, license-allowed, manifest-author-string, manifest-deprecated-key, - manifest-required-author, manifest-required-key, manifest-version-format, method-compute, diff --git a/.travis.yml b/.travis.yml index 4b5ed106..f579f529 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,17 +14,10 @@ addons: - expect-dev # provides unbuffer utility stages: - - linting - test jobs: include: - - stage: linting - name: "pre-commit" - install: pip install pre-commit - script: pre-commit run --all --show-diff-on-failure --verbose --color always - after_success: - before_install: - stage: test env: - TESTS=1 ODOO_REPO="odoo/odoo" MAKEPOT="1" @@ -34,11 +27,13 @@ jobs: env: global: - VERSION="14.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0" + - WKHTMLTOPDF_VERSION="0.12.5" - MQT_DEP=PIP install: - - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git - ${HOME}/maintainer-quality-tools + - git clone -b master-eficent + https://github.com/ForgeFlow/maintainer-quality-tools.git + $HOME/maintainer-quality-tools - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - travis_install_nightly diff --git a/setup/.setuptools-odoo-make-default-ignore b/setup/.setuptools-odoo-make-default-ignore new file mode 100644 index 00000000..207e6153 --- /dev/null +++ b/setup/.setuptools-odoo-make-default-ignore @@ -0,0 +1,2 @@ +# addons listed in this file are ignored by +# setuptools-odoo-make-default (one addon per line) diff --git a/setup/README b/setup/README new file mode 100644 index 00000000..a63d633e --- /dev/null +++ b/setup/README @@ -0,0 +1,2 @@ +To learn more about this directory, please visit +https://pypi.python.org/pypi/setuptools-odoo