From b55c36a0631c6644f226804f1f995f8be9c0d6c1 Mon Sep 17 00:00:00 2001 From: DavidJForgeFlow Date: Wed, 1 Feb 2023 13:34:06 +0100 Subject: [PATCH] [13.0] Update Copier --- .copier-answers.yml | 12 ++++++++- .eslintrc.yml | 2 +- .github/workflows/pre-commit.yml | 25 +++++++++++++++---- .github/workflows/test.yml | 24 ++++++++++++++++-- .gitignore | 1 - .pre-commit-config.yaml | 12 ++++++--- .pylintrc | 2 ++ .pylintrc-mandatory | 1 + .t2d.yml | 42 -------------------------------- CONTRIBUTING.md | 10 -------- README.md | 16 ++++++------ 11 files changed, 74 insertions(+), 73 deletions(-) delete mode 100644 .t2d.yml delete mode 100644 CONTRIBUTING.md diff --git a/.copier-answers.yml b/.copier-answers.yml index 2b17fb68..9e5d31be 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,14 +1,24 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.3.5 +_commit: v1.14.1 _src_path: https://github.com/OCA/oca-addons-repo-template.git ci: GitHub dependency_installation_mode: OCA generate_requirements_txt: false +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: true odoo_version: 13.0 +org_name: ForgeFlow +org_slug: ForgeFlow rebel_module_groups: [] repo_description: Manage returns authorizations repo_name: stock-rma repo_slug: https://github.com/ForgeFlow/stock-rma +repo_website: https://github.com/ForgeFlow/stock-rma travis_apt_packages: [] travis_apt_sources: [] + diff --git a/.eslintrc.yml b/.eslintrc.yml index d4cc423c..9429bc68 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 c07815d3..889480b0 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -10,12 +10,27 @@ on: jobs: pre-commit: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - # The pylint-odoo version we use here does not support python 3.10 - # https://github.com/OCA/oca-addons-repo-template/issues/80 - python-version: "3.9" - - uses: pre-commit/action@v2.0.0 + python-version: "3.8" + - name: Get python version + run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV + - uses: actions/cache@v1 + with: + 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/.github/workflows/test.yml b/.github/workflows/test.yml index 21faf624..15042609 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: test Odoo addons +name: tests on: pull_request: @@ -9,16 +9,36 @@ on: - "13.0" jobs: - test: + unreleased-deps: runs-on: ubuntu-latest + name: Detect unreleased dependencies + steps: + - uses: actions/checkout@v2 + - run: | + for reqfile in requirements.txt test-requirements.txt ; do + if [ -f ${reqfile} ] ; then + result=0 + # reject non-comment lines that contain a / (i.e. URLs, relative paths) + grep "^[^#].*/" ${reqfile} || result=$? + if [ $result -eq 0 ] ; then + echo "Unreleased dependencies found in ${reqfile}." + exit 1 + fi + fi + done + test: + runs-on: ubuntu-20.04 container: ${{ matrix.container }} + name: ${{ matrix.name }} strategy: fail-fast: false matrix: include: - container: ghcr.io/oca/oca-ci/py3.6-odoo13.0:latest makepot: "true" + name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.6-ocb13.0:latest + name: test with OCB services: postgres: image: postgres:9.6 diff --git a/.gitignore b/.gitignore index 818770fb..9c283fd4 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,6 @@ build/ develop-eggs/ dist/ eggs/ -lib/ lib64/ parts/ sdist/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4f163ad1..37d01459 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) @@ -27,6 +27,11 @@ repos: entry: found forbidden files; remove them language: fail 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 rev: ab1d7f6 hooks: @@ -49,6 +54,7 @@ repos: rev: 22.3.0 hooks: - id: black + additional_dependencies: ["click<8.1.0"] - repo: https://github.com/pre-commit/mirrors-prettier rev: v1.19.1 hooks: @@ -101,10 +107,10 @@ repos: name: isort except __init__.py exclude: /__init__\.py$ - repo: https://github.com/acsone/setuptools-odoo - rev: 2.5.2 + rev: 3.1.8 hooks: - id: setuptools-odoo-make-default - - repo: https://gitlab.com/pycqa/flake8 + - repo: https://github.com/PyCQA/flake8 rev: 3.7.9 hooks: - id: flake8 diff --git a/.pylintrc b/.pylintrc index d11f8c2a..babb1e4d 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,3 +1,5 @@ + + [MASTER] load-plugins=pylint_odoo score=n diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory index bcf4f4f4..b78d0443 100644 --- a/.pylintrc-mandatory +++ b/.pylintrc-mandatory @@ -1,3 +1,4 @@ + [MASTER] load-plugins=pylint_odoo score=n diff --git a/.t2d.yml b/.t2d.yml deleted file mode 100644 index 18deefe9..00000000 --- a/.t2d.yml +++ /dev/null @@ -1,42 +0,0 @@ -language: python -cache: - directories: - - $HOME/.cache/pip - - $HOME/.cache/pre-commit - -python: - - "3.6" - -addons: - postgresql: "9.6" - apt: - packages: - - expect-dev # provides unbuffer utility - -stages: - - test - -jobs: - include: - - stage: test - env: - - TESTS=1 ODOO_REPO="odoo/odoo" MAKEPOT="1" - - stage: test - env: - - TESTS=1 ODOO_REPO="OCA/OCB" -env: - global: - - VERSION="13.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0" - - WKHTMLTOPDF_VERSION="0.12.5" - -install: - - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git - ${HOME}/maintainer-quality-tools - - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - - travis_install_nightly - -script: - - travis_run_tests - -after_success: - - travis_after_tests_success diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 9ac71fee..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,10 +0,0 @@ -# OCA Guidelines - -Please follow the official guide from the -[OCA Guidelines page](https://odoo-community.org/page/contributing). - -## Project Specific Guidelines - - - -This project does not have specific coding guidelines. diff --git a/README.md b/README.md index 2e65058b..338f183e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,10 @@ -[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat//13.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-https://github.com/ForgeFlow/stock-rma-) -[![Build Status](https://travis-ci.com/OCA/https://github.com/ForgeFlow/stock-rma.svg?branch=13.0)](https://travis-ci.com/OCA/https://github.com/ForgeFlow/stock-rma) -[![codecov](https://codecov.io/gh/OCA/https://github.com/ForgeFlow/stock-rma/branch/13.0/graph/badge.svg)](https://codecov.io/gh/OCA/https://github.com/ForgeFlow/stock-rma) -[![Translation Status](https://translation.odoo-community.org/widgets/https://github.com/ForgeFlow/stock-rma-13-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/https://github.com/ForgeFlow/stock-rma-13-0/?utm_source=widget) + + + +[![Pre-commit Status](https://github.com/ForgeFlow/https://github.com/ForgeFlow/stock-rma/actions/workflows/pre-commit.yml/badge.svg?branch=13.0)](https://github.com/ForgeFlow/https://github.com/ForgeFlow/stock-rma/actions/workflows/pre-commit.yml?query=branch%3A13.0) +[![Build Status](https://github.com/ForgeFlow/https://github.com/ForgeFlow/stock-rma/actions/workflows/test.yml/badge.svg?branch=13.0)](https://github.com/ForgeFlow/https://github.com/ForgeFlow/stock-rma/actions/workflows/test.yml?query=branch%3A13.0) +[![codecov](https://codecov.io/gh/ForgeFlow/https://github.com/ForgeFlow/stock-rma/branch/13.0/graph/badge.svg)](https://codecov.io/gh/ForgeFlow/https://github.com/ForgeFlow/stock-rma) + @@ -25,12 +28,9 @@ This part will be replaced when running the oca-gen-addons-table script from OCA 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 ForgeFlow 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.