From 1decd378e61e3b29e3f3c318bf0fb5bee990ab30 Mon Sep 17 00:00:00 2001 From: trisdoan Date: Wed, 8 Jan 2025 17:48:03 +0700 Subject: [PATCH] [FIX] replace pkg_resources with importlib.metadata --- oca_port/migrate_addon.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/oca_port/migrate_addon.py b/oca_port/migrate_addon.py index 3041fe7..d34751a 100644 --- a/oca_port/migrate_addon.py +++ b/oca_port/migrate_addon.py @@ -4,7 +4,7 @@ import os import tempfile import urllib.parse -import pkg_resources +from importlib import metadata import click @@ -154,10 +154,12 @@ def run(self): with tempfile.TemporaryDirectory() as patches_dir: self._generate_patches(patches_dir) self._apply_patches(patches_dir) - if pkg_resources.get_distribution("odoo-module-migrator") is None: - g.run_pre_commit(self.app.repo, self.app.addon) - else: + + try: + metadata.metadata("odoo-module-migrator") adapted = self._apply_code_pattern() + except metadata.PackageNotFoundError: + g.run_pre_commit(self.app.repo, self.app.addon) # Check if the addon has commits that update neighboring addons to # make it work properly PortAddonPullRequest(self.app, push_branch=False).run() @@ -296,3 +298,4 @@ def _apply_code_pattern(self): return True except KeyboardInterrupt: pass + return False