Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add version 17 #226

Merged
merged 1 commit into from
Nov 7, 2023
Merged

Add version 17 #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ jobs:
- odoo-version: 16.0
python-version: "3.10"
machine: ubuntu-22.04
- odoo-version: 17.0
python-version: "3.10"
machine: ubuntu-22.04
Comment on lines +35 to +37
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- odoo-version: 17.0
python-version: "3.10"
machine: ubuntu-22.04
- odoo-version: 17.0
python-version: "3.11"
machine: ubuntu-22.04

Does it makes sense to use 3.11 ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for the test of the template itself. It does not matter that much, I think. For for testing the addons we want to test on 3.10 which is the minimum Python version we want to support (in alignment with what Odoo decided in odoo/odoo#136904).

steps:
# Prepare environment
- uses: actions/checkout@v3
Expand Down
3 changes: 2 additions & 1 deletion copier.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ _migrations:

odoo_version:
type: float
default: 16.0
default: 17.0
choices:
- 10.0
- 11.0
Expand All @@ -22,6 +22,7 @@ odoo_version:
- 14.0
- 15.0
- 16.0
- 17.0
help: Which Odoo version are we deploying in this branch?

org_slug:
Expand Down
2 changes: 2 additions & 0 deletions src/.github/workflows/{% if ci == 'GitHub' %}test.yml{% endif %}.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
{%
set IMAGES = {
"odoo": {
17.0: "ghcr.io/oca/oca-ci/py3.10-odoo17.0:latest",
16.0: "ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest",
15.0: "ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest",
14.0: "ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest",
Expand All @@ -21,6 +22,7 @@ set IMAGES = {
10.0: "ghcr.io/oca/oca-ci/py2.7-odoo10.0:latest",
},
"ocb": {
17.0: "ghcr.io/oca/oca-ci/py3.10-ocb17.0:latest",
16.0: "ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest",
15.0: "ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest",
14.0: "ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest",
Expand Down
10 changes: 7 additions & 3 deletions tests/test_copy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,13 @@ def test_bootstrap(tmp_path: Path, odoo_version: float, cloned_template: Path):
assert "# This .pylintrc contains" in pylintrc_optional
assert f"{valid_odoo_versions}={odoo_version}" in pylintrc_optional
assert SOME_PYLINT_OPTIONAL_CHECK in pylintrc_optional
flake8 = (tmp_path / ".flake8").read_text()
assert "[flake8]" in flake8
if odoo_version > 12:
if odoo_version < 17:
flake8 = (tmp_path / ".flake8").read_text()
assert "[flake8]" in flake8
else:
ruff = (tmp_path / ".ruff.toml").read_text()
assert "[lint]" in ruff
if odoo_version > 12 and odoo_version < 17:
isort = (tmp_path / ".isort.cfg").read_text()
assert "[settings]" in isort
assert not (tmp_path / ".gitmodules").is_file()
Expand Down