Skip to content

Commit

Permalink
[INIT] Adapt to V17
Browse files Browse the repository at this point in the history
- Apply new copier template. (from v1.14.2 to v1.18 : replace setup by pyproject.toml, replace black by ruff, ...)
- Disable .github/workflows/test.yml because the openupgrade is not initialized yet
- add new empty modules160-170.rst file
  • Loading branch information
legalsylvain committed Nov 9, 2023
1 parent 3e69eab commit 7070fdd
Show file tree
Hide file tree
Showing 15 changed files with 111 additions and 1,035 deletions.
13 changes: 7 additions & 6 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.14.2
_commit: v1.18
_src_path: gh:oca/oca-addons-repo-template
additional_ruff_rules: []
ci: GitHub
dependency_installation_mode: PIP
generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
Expand All @@ -11,14 +11,15 @@ github_enable_makepot: false
github_enable_stale_action: false
github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: false
odoo_version: 16.0
odoo_test_flavor: Odoo
odoo_version: 17.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
rebel_module_groups: []
repo_description: null
repo_description: OpenUpgrade
repo_name: 'Open Source upgrade path for Odoo/OpenERP '
repo_slug: openupgrade
repo_website: https://github.com/OCA/OpenUpgrade
travis_apt_packages: []
travis_apt_sources: []
use_pyproject_toml: true
use_ruff: true

1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ globals:
odoo: readonly
openerp: readonly
owl: readonly
luxon: readonly

# Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
Expand Down
12 changes: 0 additions & 12 deletions .flake8

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/documentation-commit.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# On each push in 16.0 branch,
# On each push in 17.0 branch,
# AND if the coverage file changed,
# build documentation branch and commit the changes
# so that the changes are visible on the website
Expand All @@ -8,7 +8,7 @@ name: Build and commit documentation

on:
push:
paths: ["docsource/modules150-160.rst"]
paths: ["docsource/modules160-170.rst"]

jobs:
documentation-commit:
Expand All @@ -27,7 +27,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: odoo/odoo
ref: "16.0"
ref: "17.0"
fetch-depth: 1
path: odoo
- name: Configuration
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: pre-commit
on:
pull_request:
branches:
- "16.0*"
- "17.0*"
push:
branches:
- "16.0"
- "16.0-ocabot-*"
- "17.0"
- "17.0-ocabot-*"

jobs:
pre-commit:
Expand All @@ -27,6 +27,15 @@ jobs:
run: pip install pre-commit
- name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure --color=always
env:
# Consider valid a PR that changes README fragments but doesn't
# change the README.rst file itself. It's not really a problem
# because the bot will update it anyway after merge. This way, we
# lower the barrier for functional contributors that want to fix the
# readme fragments, while still letting developers get README
# auto-generated (which also helps functionals when using runboat).
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
SKIP: oca-gen-addon-readme
- name: Check that all files generated by pre-commit are in git
run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
name: Test OpenUpgrade migration

on:
push:
branches: ["16.0*"]
pull_request:
# push:
# branches: ["17.0*"]
# pull_request:

jobs:
test:
Expand Down Expand Up @@ -44,19 +44,19 @@ jobs:
run: createdb $DB
- name: DB Restore
run: |
wget -q -O- $DOWNLOADS/15.0.psql | pg_restore -d $DB --no-owner
wget -q -O- $DOWNLOADS/16.0.psql | pg_restore -d $DB --no-owner
- name: Check out Odoo
uses: actions/checkout@v2
with:
repository: odoo/odoo
ref: "16.0"
ref: "17.0"
fetch-depth: 1
path: odoo
- name: Check out previous Odoo
uses: actions/checkout@v2
with:
repository: odoo/odoo
ref: "15.0"
ref: "16.0"
fetch-depth: 1
path: odoo-old
- name: Check out OpenUpgrade
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
run: |
pip install -q -r odoo/requirements.txt
pip install -r ./openupgrade/requirements.txt
# this is for v15 l10n_eg_edi_eta which crashes without it
# this is for v16 l10n_eg_edi_eta which crashes without it
pip install asn1crypto
- name: Test data
run: |
Expand All @@ -99,15 +99,15 @@ jobs:
# select modules and perform the upgrade
MODULES_OLD=$(\
sed -n '/^+========/,$p' \
openupgrade/docsource/modules150-160.rst \
openupgrade/docsource/modules160-170.rst \
| grep "Done\|Partial\|Nothing" \
| grep -v "theme_" \
| sed -rn 's/((^\| *\|del\| *)|^\| *)([0-9a-z_]*)[ \|].*/\3/g p' \
| sed '/^\s*$/d' \
| paste -d, -s)
MODULES_NEW=$(\
sed -n '/^+========/,$p' \
openupgrade/docsource/modules150-160.rst \
openupgrade/docsource/modules160-170.rst \
| grep "Done\|Partial\|Nothing" \
| grep -v "theme_" \
| sed -rn 's/((^\| *\|new\| *)|^\| *)([0-9a-z_]*)[ \|].*/\3/g p' \
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ __pycache__/
*.py[cod]
/.venv
/.pytest_cache
/.ruff_cache

# C extensions
*.so
Expand Down
13 changes: 0 additions & 13 deletions .isort.cfg

This file was deleted.

63 changes: 26 additions & 37 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ exclude: |
/static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$|
# Don't bother non-technical authors with formatting issues in docs
readme/.*\.(rst|md)$|
# Ignore build and dist directories in addons
/build/|/dist/|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
Expand All @@ -32,28 +36,30 @@ repos:
entry: found a en.po file
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/sbidoul/whool
rev: v0.5
hooks:
- id: whool-init
- repo: https://github.com/oca/maintainer-tools
rev: 4cd2b852214dead80822e93e6749b16f2785b2fe
rev: 568cacd1d6eef453063a524a5ce63dcd49c7259b
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/OpenUpgrade"]
- repo: https://github.com/myint/autoflake
rev: v1.6.1
hooks:
- id: autoflake
- id: oca-gen-addon-readme
args:
- --expand-star-imports
- --ignore-init-module-imports
- --in-place
- --remove-all-unused-imports
- --remove-duplicate-keys
- --remove-unused-variables
- repo: https://github.com/psf/black
rev: 22.8.0
- --addons-dir=.
- --branch=17.0
- --org-name=OCA
- --repo-name=openupgrade
- --if-source-changed
- id: oca-gen-external-dependencies
- repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.0.25
hooks:
- id: black
- id: oca-checks-odoo-module
- id: oca-checks-po
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1
hooks:
Expand Down Expand Up @@ -95,31 +101,14 @@ repos:
- id: check-xml
- id: mixed-line-ending
args: ["--fix=lf"]
- repo: https://github.com/asottile/pyupgrade
rev: v2.38.2
hooks:
- id: pyupgrade
args: ["--keep-percent-format"]
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
hooks:
- id: isort
name: isort except __init__.py
args:
- --settings=.
exclude: /__init__\.py$
- repo: https://github.com/acsone/setuptools-odoo
rev: 3.1.8
hooks:
- id: setuptools-odoo-make-default
- repo: https://github.com/PyCQA/flake8
rev: 3.9.2
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.3
hooks:
- id: flake8
name: flake8
additional_dependencies: ["flake8-bugbear==21.9.2"]
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- id: ruff-format
- repo: https://github.com/OCA/pylint-odoo
rev: 7.0.2
rev: v8.0.19
hooks:
- id: pylint_odoo
name: pylint with optional checks
Expand Down
12 changes: 6 additions & 6 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ load-plugins=pylint_odoo
score=n

[ODOOLINT]
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest_required_authors=Odoo Community Association (OCA)
manifest_required_keys=license
manifest_deprecated_keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=16.0
readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest-required-authors=Odoo Community Association (OCA)
manifest-required-keys=license
manifest-deprecated-keys=description,active
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid-odoo-versions=17.0

[MESSAGES CONTROL]
disable=all
Expand Down
12 changes: 6 additions & 6 deletions .pylintrc-mandatory
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ load-plugins=pylint_odoo
score=n

[ODOOLINT]
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest_required_authors=Odoo Community Association (OCA)
manifest_required_keys=license
manifest_deprecated_keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=16.0
readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest-required-authors=Odoo Community Association (OCA)
manifest-required-keys=license
manifest-deprecated-keys=description,active
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid-odoo-versions=17.0

[MESSAGES CONTROL]
disable=all
Expand Down
29 changes: 29 additions & 0 deletions .ruff.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

target-version = "py310"
fix = true

[lint]
extend-select = [
"B",
"C90",
"I", # isort
"UP", # pyupgrade
]
exclude = ["setup/*"]

[format]
exclude = ["setup/*"]

[per-file-ignores]
"__init__.py" = ["F401", "I001"] # ignore unused and unsorted imports in __init__.py
"__manifest__.py" = ["B018"] # useless expression

[isort]
section-order = ["future", "standard-library", "third-party", "odoo", "odoo-addons", "first-party", "local-folder"]

[isort.sections]
"odoo" = ["odoo"]
"odoo-addons" = ["odoo.addons"]

[mccabe]
max-complexity = 16
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[![Pre-commit Status](https://github.com/OCA/OpenUpgrade/actions/workflows/pre-commit.yml/badge.svg?branch=16.0)](https://github.com/OCA/OpenUpgrade/actions/workflows/pre-commit.yml?query=branch%3A16.0)
[![Build Status](https://github.com/OCA/OpenUpgrade/actions/workflows/test.yml/badge.svg?branch=16.0)](https://github.com/OCA/OpenUpgrade/actions/workflows/test.yml?query=branch%3A16.0)
[![codecov](https://codecov.io/gh/OCA/OpenUpgrade/branch/16.0/graph/badge.svg)](https://codecov.io/gh/OCA/openupgrade)

[![Pre-commit Status](https://github.com/OCA/openupgrade/actions/workflows/pre-commit.yml/badge.svg?branch=17.0)](https://github.com/OCA/openupgrade/actions/workflows/pre-commit.yml?query=branch%3A17.0)
[![Build Status](https://github.com/OCA/openupgrade/actions/workflows/test.yml/badge.svg?branch=17.0)](https://github.com/OCA/openupgrade/actions/workflows/test.yml?query=branch%3A17.0)
[![codecov](https://codecov.io/gh/OCA/openupgrade/branch/17.0/graph/badge.svg)](https://codecov.io/gh/OCA/openupgrade)

<!-- /!\ do not modify above this line -->

Expand Down
Loading

0 comments on commit 7070fdd

Please sign in to comment.