pum 1.3.1__py3-none-any.whl → 1.3.3__py3-none-any.whl

pum/hook.py

@@ -93,7 +93,6 @@ class HookHandler:
         self.code = code
         self.hook_instance = None
         self.sys_path_additions = []  # Store paths to add during execution
-        self._imported_modules = []  # Track modules imported by this hook
 
         if file:
             if isinstance(file, str):
@@ -112,32 +111,38 @@ class HookHandler:
             parent_dir = str(self.file.parent.resolve())
 
             # Store paths that need to be added for hook execution
-            # Add parent directory of the hook file
-            if parent_dir not in sys.path:
-                self.sys_path_additions.append(parent_dir)
+            # Always add paths even if already in sys.path - we need them at position 0
+            # for priority and we'll track what we added for cleanup
+            self.sys_path_additions.append(parent_dir)
 
             # Also add base_path if provided, to support imports from sibling directories
             if base_path is not None:
                 base_path_str = str(base_path.resolve())
-                if base_path_str not in sys.path and base_path_str != parent_dir:
+                if base_path_str != parent_dir:
                     self.sys_path_additions.append(base_path_str)
 
-            # Temporarily add paths for module loading
-            for path in self.sys_path_additions:
+            # Add paths for module loading - insert at position 0 for priority
+            for path in reversed(self.sys_path_additions):
                 sys.path.insert(0, path)
 
-            # Track modules before loading to detect new imports
-            modules_before = set(sys.modules.keys())
+            # Invalidate caches so Python recognizes the new paths
+            importlib.invalidate_caches()
 
             try:
-                spec = importlib.util.spec_from_file_location(self.file.stem, self.file)
+                logger.debug(f"Loading hook from: {self.file}")
+                logger.debug(f"sys.path additions: {self.sys_path_additions}")
+                spec = importlib.util.spec_from_file_location(
+                    self.file.stem,
+                    self.file,
+                    submodule_search_locations=[parent_dir],
+                )
                 module = importlib.util.module_from_spec(spec)
+                # Set __path__ to enable package-like imports from the hook's directory
+                module.__path__ = [parent_dir]
+                # Add to sys.modules before executing so imports can find it
+                sys.modules[self.file.stem] = module
                 spec.loader.exec_module(module)
 
-                # Track modules that were imported by this hook
-                modules_after = set(sys.modules.keys())
-                self._imported_modules = list(modules_after - modules_before)
-
                 # Check that the module contains a class named Hook inheriting from HookBase
                 # Do this BEFORE removing paths from sys.path
                 hook_class = getattr(module, "Hook", None)
@@ -176,21 +181,22 @@ class HookHandler:
                     arg for arg in arg_names if arg not in ("self", "connection")
                 ]
 
-            finally:
-                # Remove all paths that were added
-                for path in self.sys_path_additions:
-                    if path in sys.path:
-                        sys.path.remove(path)
+            except Exception:
+                # On error, clean up paths we added
+                self.cleanup_sys_path()
+                raise
+
+    def cleanup_sys_path(self) -> None:
+        """Remove paths that were added to sys.path for this hook.
 
-    def cleanup_imports(self):
-        """Remove imported modules from sys.modules cache.
-        This should be called when switching to a different module version
-        to prevent import conflicts.
+        This should be called when the hook is no longer needed to prevent
+        sys.path pollution.
         """
-        for module_name in self._imported_modules:
-            if module_name in sys.modules:
-                del sys.modules[module_name]
-        self._imported_modules.clear()
+        for path in self.sys_path_additions:
+            # Remove all occurrences of this path (we may have added it multiple times)
+            while path in sys.path:
+                sys.path.remove(path)
+        self.sys_path_additions.clear()
 
     def __repr__(self) -> str:
         """Return a string representation of the Hook instance."""

pum/pum_config.py

@@ -184,15 +184,31 @@ class PumConfig:
         return self._base_path
 
     def cleanup_hook_imports(self) -> None:
-        """Clean up imported modules from hooks to prevent conflicts when switching versions.
+        """Clean up imported modules and sys.path entries from hooks.
 
         This should be called when switching to a different module version to ensure
         that cached imports from the previous version don't cause conflicts.
         """
+        # First, clean up sys.path additions from all cached handlers
         for handler in self._cached_handlers:
-            if hasattr(handler, "cleanup_imports"):
-                handler.cleanup_imports()
-        # Clear the cache after cleanup
+            handler.cleanup_sys_path()
+
+        # Clear all modules that were loaded from this base_path
+        base_path_str = str(self._base_path.resolve())
+        modules_to_remove = []
+
+        for module_name, module in list(sys.modules.items()):
+            if module is None:
+                continue
+            module_file = getattr(module, "__file__", None)
+            if module_file and module_file.startswith(base_path_str):
+                modules_to_remove.append(module_name)
+
+        for module_name in modules_to_remove:
+            if module_name in sys.modules:
+                logger.debug(f"Removing cached module: {module_name}")
+                del sys.modules[module_name]
+
         self._cached_handlers.clear()
 
     def parameters(self) -> list[ParameterDefinition]:

{pum-1.3.1.dist-info → pum-1.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pum
-Version: 1.3.1
+Version: 1.3.3
 Summary: Pum stands for "Postgres Upgrades Manager". It is a Database migration management tool very similar to flyway-db or Liquibase, based on metadata tables.
 Author-email: Denis Rouzaud <denis@opengis.ch>
 License-Expression: GPL-2.0-or-later

{pum-1.3.1.dist-info → pum-1.3.3.dist-info}/RECORD

@@ -8,18 +8,18 @@ pum/dependency_handler.py,sha256=1A6720Tv0rBME-gJVLn9PYK46YPXLMD-r9hpNNX8ApY,696
 pum/dumper.py,sha256=FFRidaOg3ENePNZ61TGbnAdp0TItvWbA4j292Xlf9bA,3878
 pum/exceptions.py,sha256=h1TEPHI_hSbLLQc6zYfTpFexczv1iKIN7OuTsLTN590,1439
 pum/feedback.py,sha256=pbZYdhsocjmJbjcdUpvYhI8XLio15htyVg-Cay6HHdE,3810
-pum/hook.py,sha256=G-qI1J4erWPWw5mRa-BHFVtA9yYTGcTK3aYmqaoKep8,12528
+pum/hook.py,sha256=twhlQtklBHUY2W9PAseTKTMhpsnkl8hNG36I-9oz8iU,12841
 pum/info.py,sha256=75Fr4Bn-ARe36aK8KV31MSCNWDkAdiMgJ-4IvMF73zU,1346
 pum/parameter.py,sha256=e7Lm5fp2Xg4SEkIDmbxSyNTsYvELCkeyPUeS6CCs6EA,2646
-pum/pum_config.py,sha256=k-YF2nL73HcfybjV09G042Xuiu8nRWSxAI43JyiCTsg,14952
+pum/pum_config.py,sha256=l9PybZURB4ZUbvVC-QeXyLrtawByWt3OiN2CS5BKiwM,15565
 pum/report_generator.py,sha256=upv6gpVZ_kk7O6IhcO7LWMlPHg_u_V0wx_LxQebMp-c,38908
 pum/role_manager.py,sha256=_LG5LR8osc5bVQVb-AKGU3wvXBrIe9J3IV1ECzhiwnA,15991
 pum/schema_migrations.py,sha256=-yR84KkG1mLY5yeEWzidNPam1hrE_1mMC5KJaHOUxiA,16304
 pum/sql_content.py,sha256=BY5XMS713sIOUT4xLHByOzQhxYItucvkCFEyzmwSTR4,12969
 pum/upgrader.py,sha256=skGfwfuAb0TLMqCPjRbcJNf1VKmekaaQLm_C-abs61E,18353
-pum-1.3.1.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pum-1.3.1.dist-info/METADATA,sha256=xcbQ-mlS84gzT_6xj2tzxj4JeA2LPf6PowfHY83CfYA,3236
-pum-1.3.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pum-1.3.1.dist-info/entry_points.txt,sha256=U6dmxSpKs1Pe9vWiR29VPhJMDjrmZeJCSxvfLGR8BD4,36
-pum-1.3.1.dist-info/top_level.txt,sha256=ddiI4HLBhY6ql-NNm0Ez0JhoOHdWDIzrHeCdHmmagcc,4
-pum-1.3.1.dist-info/RECORD,,
+pum-1.3.3.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pum-1.3.3.dist-info/METADATA,sha256=CKhXiAoGzcAz_bHXF-4g1tyd3XHYNyJ0yU7ug5p31CM,3236
+pum-1.3.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pum-1.3.3.dist-info/entry_points.txt,sha256=U6dmxSpKs1Pe9vWiR29VPhJMDjrmZeJCSxvfLGR8BD4,36
+pum-1.3.3.dist-info/top_level.txt,sha256=ddiI4HLBhY6ql-NNm0Ez0JhoOHdWDIzrHeCdHmmagcc,4
+pum-1.3.3.dist-info/RECORD,,