Merge pull request OCA#226 from dixmit/master2

Add version 17
acsone · Nov 7, 2023 · 8f0b937 · 8f0b937
2 parents 69f3b9a + 072cfae
commit 8f0b937
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -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
     steps:
       # Prepare environment
       - uses: actions/checkout@v3

diff --git a/copier.yml b/copier.yml
@@ -13,7 +13,7 @@ _migrations:
 
 odoo_version:
   type: float
-  default: 16.0
+  default: 17.0
   choices:
     - 10.0
     - 11.0
@@ -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:

diff --git a/src/.github/workflows/{% if ci == 'GitHub' %}test.yml{% endif %}.jinja b/src/.github/workflows/{% if ci == 'GitHub' %}test.yml{% endif %}.jinja
@@ -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",
@@ -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",

diff --git a/tests/test_copy.py b/tests/test_copy.py
@@ -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()