Merge pull request #322 from acsone/rm-legacy-build

Remove legacy wheel build mechanism

Author: sbidoul

src/oca_github_bot/build_wheels.py

@@ -8,10 +8,10 @@
 import sys
 import tempfile
 from pathlib import Path
-from typing import Tuple, Union
+from typing import Union
 
 from .config import WHEEL_BUILD_TOOLS
-from .manifest import addon_dirs_in, get_manifest, get_odoo_series_from_version
+from .manifest import addon_dirs_in, get_manifest
 from .process import check_call
 from .pypi import DistPublisher
 
@@ -65,25 +65,6 @@ def build_wheel(self, project_dir: Path, dist_dir: str) -> None:
         self._check_wheels(dist_dir)
         return True
 
-    def build_wheel_legacy(
-        self, project_dir: Path, dist_dir: str, python_tag: Union[str, None] = None
-    ) -> None:
-        with tempfile.TemporaryDirectory() as bdist_dir:
-            cmd = [
-                self.env_python,
-                "setup.py",
-                "bdist_wheel",
-                "--dist-dir",
-                dist_dir,
-                "--bdist-dir",
-                bdist_dir,
-            ]
-            if python_tag:
-                cmd.extend(["--python-tag", python_tag])
-            check_call(cmd, cwd=project_dir)
-        self._check_wheels(dist_dir)
-        return True
-
     def _check_wheels(self, dist_dir: Path) -> None:
         wheels = [f for f in os.listdir(dist_dir) if f.endswith(".whl")]
         check_call(["twine", "check"] + wheels, cwd=dist_dir)
@@ -93,16 +74,12 @@ def build_addon_wheel(self, addon_dir: Path, dist_dir: str) -> None:
         if not manifest.get("installable", True):
             return False
 
-        series = get_odoo_series_from_version(manifest.get("version", ""))
-
-        if series >= (12, 0) and (addon_dir / "pyproject.toml").is_file():
+        if (addon_dir / "pyproject.toml").is_file():
             return self.build_wheel(addon_dir, dist_dir)
 
         setup_py_dir = addon_dir / ".." / "setup" / addon_dir.name
-        if series >= (8, 0) and (setup_py_dir / "setup.py").is_file():
-            return self.build_wheel_legacy(
-                setup_py_dir, dist_dir, python_tag="py2" if series < (11, 0) else "py3"
-            )
+        if (setup_py_dir / "setup.py").is_file():
+            return self.build_wheel(setup_py_dir, dist_dir)
 
         return False
 
@@ -132,7 +109,6 @@ def build_and_publish_wheels(
 def build_and_publish_metapackage_wheel(
     addons_dir: str,
     dist_publisher: DistPublisher,
-    series: Tuple[int, int],
     dry_run: bool,
 ):
     setup_dir = Path(addons_dir) / "setup" / "_metapackage"
@@ -148,7 +124,5 @@ def build_and_publish_metapackage_wheel(
             setup_dir.joinpath("setup.cfg").write_text(
                 "[metadata]\nlong_description = UNKNOWN\n"
             )
-        if Builder.get().build_wheel_legacy(
-            setup_dir, dist_dir, python_tag="py2" if series < (11, 0) else "py3"
-        ):
+        if Builder.get().build_wheel(setup_dir, dist_dir):
             dist_publisher.publish(dist_dir, dry_run)

src/oca_github_bot/config.py

@@ -144,7 +144,7 @@ def func_wrapper(*args, **kwargs):
 ).split(",")
 
 # minimum Odoo series supported by the bot
-MAIN_BRANCH_BOT_MIN_VERSION = os.environ.get("MAIN_BRANCH_BOT_MIN_VERSION", "8.0")
+MAIN_BRANCH_BOT_MIN_VERSION = os.environ.get("MAIN_BRANCH_BOT_MIN_VERSION", "11.0")
 
 # First Odoo Series for which the whool_init and gen_metapackage tasks are run on main
 # branches. For previous versions, the setuptools_odoo task is run and generates

src/oca_github_bot/tasks/main_branch_bot.py

@@ -12,7 +12,6 @@
     switchable,
 )
 from ..github import git_commit_if_needed, git_push_if_needed, temporary_clone
-from ..manifest import get_odoo_series_from_branch
 from ..process import check_call
 from ..queue import getLogger, task
 from ..version_branch import is_main_branch_bot_branch, is_supported_main_branch
@@ -144,7 +143,6 @@ def main_branch_bot(org, repo, branch, build_wheels, dry_run=False):
             build_and_publish_metapackage_wheel(
                 clone_dir,
                 dist_publisher,
-                get_odoo_series_from_branch(branch),
                 dry_run,
             )
 

tests/test_build_wheels.py

@@ -81,31 +81,20 @@ def test_build_and_publish_wheels(setup_py, tmp_path):
     assert wheels[0].startswith("odoo12_addon_addon1")
     assert wheels[0].endswith(".whl")
     assert "-py3-" in wheels[0]
-    # build with two addons, don't use pyproject.toml for this version
-    _make_addon(addons_dir, "addon2", "10.0", setup_py=True, pyproject=False)
-    build_and_publish_wheels(str(addons_dir), dist_publisher, dry_run=False)
-    wheel_dirs = sorted(os.listdir(simple_index_root))
-    assert len(wheel_dirs) == 2
-    assert wheel_dirs[0] == "odoo10-addon-addon2"
-    wheels = os.listdir(simple_index_root / "odoo10-addon-addon2")
-    assert len(wheels) == 1
-    assert wheels[0].startswith("odoo10_addon_addon2")
-    assert wheels[0].endswith(".whl")
-    assert "-py2-" in wheels[0]
     # test tag for Odoo 11, don't use pyproject.toml for this version
     _make_addon(addons_dir, "addon3", "11.0", setup_py=True, pyproject=False)
     build_and_publish_wheels(str(addons_dir), dist_publisher, dry_run=False)
     wheel_dirs = sorted(os.listdir(simple_index_root))
-    assert len(wheel_dirs) == 3
-    assert wheel_dirs[1] == "odoo11-addon-addon3"
+    assert len(wheel_dirs) == 2
+    assert wheel_dirs[0] == "odoo11-addon-addon3"
     wheels = os.listdir(simple_index_root / "odoo11-addon-addon3")
     assert len(wheels) == 1
     assert "-py2.py3-" in wheels[0]
     # test Odoo 15+ default addon naming scheme
     _make_addon(addons_dir, "addon4", "15.0", setup_py=setup_py, pyproject=not setup_py)
     build_and_publish_wheels(str(addons_dir), dist_publisher, dry_run=False)
     wheel_dirs = sorted(os.listdir(simple_index_root))
-    assert len(wheel_dirs) == 4
+    assert len(wheel_dirs) == 3
     assert wheel_dirs[0] == "odoo-addon-addon4"
     wheels = os.listdir(simple_index_root / "odoo-addon-addon4")
     assert len(wheels) == 1
@@ -123,9 +112,7 @@ def test_build_and_publish_metapackage(tmp_path):
     dist_publisher = RsyncDistPublisher(simple_index_root)
     # build with one addon
     _make_addon(addons_dir, "addon1", "12.0", metapackage="test")
-    build_and_publish_metapackage_wheel(
-        str(addons_dir), dist_publisher, (12, 0), dry_run=False
-    )
+    build_and_publish_metapackage_wheel(str(addons_dir), dist_publisher, dry_run=False)
     wheels = os.listdir(simple_index_root / "odoo12-addons-test")
     assert len(wheels) == 1
     assert wheels[0].startswith("odoo12_addons_test")

tests/test_version_branch.py

@@ -19,7 +19,7 @@
 def test_is_main_branch_bot_branch():
     assert not is_main_branch_bot_branch("6.1")
     assert not is_main_branch_bot_branch("7.0")
-    assert is_main_branch_bot_branch("8.0")
+    assert is_main_branch_bot_branch("11.0")
     assert is_main_branch_bot_branch("12.0")
     assert not is_main_branch_bot_branch("10.0-something")
     with set_config(MAIN_BRANCH_BOT_MIN_VERSION="10.0"):