pum 1.3.0__py3-none-any.whl → 1.3.2__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):
@@ -122,22 +121,25 @@ class HookHandler:
                 if base_path_str not in sys.path and 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:
+            # Temporarily 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())
-
             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)
@@ -182,16 +184,6 @@ class HookHandler:
                     if path in sys.path:
                         sys.path.remove(path)
 
-    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.
-        """
-        for module_name in self._imported_modules:
-            if module_name in sys.modules:
-                del sys.modules[module_name]
-        self._imported_modules.clear()
-
     def __repr__(self) -> str:
         """Return a string representation of the Hook instance."""
         return f"<hook: {self.file}>"

pum/pum_config.py

@@ -189,10 +189,22 @@ class PumConfig:
         This should be called when switching to a different module version to ensure
         that cached imports from the previous version don't cause conflicts.
         """
-        for handler in self._cached_handlers:
-            if hasattr(handler, "cleanup_imports"):
-                handler.cleanup_imports()
-        # Clear the cache after cleanup
+        # 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/schema_migrations.py

@@ -74,10 +74,9 @@ class SchemaMigrations:
             "schema": psycopg.sql.Literal(self.config.config.pum.migration_table_schema),
         }
 
-        with connection.transaction():
-            cursor = SqlContent(query).execute(connection, parameters=parameters)
-            result = cursor._pum_results[0] if cursor._pum_results else None
-            return result[0] if result else False
+        cursor = SqlContent(query).execute(connection, parameters=parameters)
+        result = cursor._pum_results[0] if cursor._pum_results else None
+        return result[0] if result else False
 
     def exists_in_other_schemas(self, connection: psycopg.Connection) -> list[str]:
         """Check if the schema_migrations information table exists in other schemas.
@@ -100,9 +99,8 @@ class SchemaMigrations:
         parameters = {
             "schema": psycopg.sql.Literal(self.config.config.pum.migration_table_schema),
         }
-        with connection.transaction():
-            cursor = SqlContent(query).execute(connection, parameters=parameters)
-            return [row[0] for row in (cursor._pum_results or [])]
+        cursor = SqlContent(query).execute(connection, parameters=parameters)
+        return [row[0] for row in (cursor._pum_results or [])]
 
     def create(
         self,
@@ -346,14 +344,13 @@ INSERT INTO {table} (
             "table": self.migration_table_identifier,
         }
 
-        with connection.transaction():
-            cursor = SqlContent(query).execute(connection, parameters=parameters)
-            row = cursor._pum_results[0] if cursor._pum_results else None
-            if row is None:
-                raise PumSchemaMigrationNoBaselineError(
-                    f"Baseline version not found in the {self.migration_table_identifier_str} table."
-                )
-            return packaging.version.parse(row[0])
+        cursor = SqlContent(query).execute(connection, parameters=parameters)
+        row = cursor._pum_results[0] if cursor._pum_results else None
+        if row is None:
+            raise PumSchemaMigrationNoBaselineError(
+                f"Baseline version not found in the {self.migration_table_identifier_str} table."
+            )
+        return packaging.version.parse(row[0])
 
     def migration_details(self, connection: psycopg.Connection, version: str | None = None) -> dict:
         """Return the migration details from the migration table.
@@ -404,14 +401,13 @@ INSERT INTO {table} (
                 "version": psycopg.sql.Literal(version),
             }
 
-        with connection.transaction():
-            cursor = SqlContent(query).execute(connection, parameters=parameters)
-            row = cursor._pum_results[0] if cursor._pum_results else None
-            if row is None:
-                raise PumSchemaMigrationError(
-                    f"Migration details not found for version {version} in the {self.migration_table_identifier_str} table."
-                )
-            return dict(zip([desc[0] for desc in cursor._pum_description], row, strict=False))
+        cursor = SqlContent(query).execute(connection, parameters=parameters)
+        row = cursor._pum_results[0] if cursor._pum_results else None
+        if row is None:
+            raise PumSchemaMigrationError(
+                f"Migration details not found for version {version} in the {self.migration_table_identifier_str} table."
+            )
+        return dict(zip([desc[0] for desc in cursor._pum_description], row, strict=False))
 
     def compare(self, connection: psycopg.Connection) -> int:
         """Compare the migrations details in the database to the changelogs in the source.

{pum-1.3.0.dist-info → pum-1.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pum
-Version: 1.3.0
+Version: 1.3.2
 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.0.dist-info → pum-1.3.2.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=KQ-9Y8iHmaN6LVo8WSAHvNzK_JGgO5321HRzsi_yYrY,12316
 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=XBRUZ8lKnmW445sQmQ61ihX5-ZAs2-MaDhvR7NRTB68,15433
 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=P3x15wQaHa4lusY2mfGKLJ8O5Ujo0Btm0s4pWDYjbS4,16536
+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.0.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pum-1.3.0.dist-info/METADATA,sha256=6kUys9BbQV0loi32auRRroyWgNDnonPIchQ6Jq8InHg,3236
-pum-1.3.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pum-1.3.0.dist-info/entry_points.txt,sha256=U6dmxSpKs1Pe9vWiR29VPhJMDjrmZeJCSxvfLGR8BD4,36
-pum-1.3.0.dist-info/top_level.txt,sha256=ddiI4HLBhY6ql-NNm0Ez0JhoOHdWDIzrHeCdHmmagcc,4
-pum-1.3.0.dist-info/RECORD,,
+pum-1.3.2.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pum-1.3.2.dist-info/METADATA,sha256=5Y-jYtwZGL8ePS1oUL4VnKqJpKj81t8RQQpv9c3SVe8,3236
+pum-1.3.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pum-1.3.2.dist-info/entry_points.txt,sha256=U6dmxSpKs1Pe9vWiR29VPhJMDjrmZeJCSxvfLGR8BD4,36
+pum-1.3.2.dist-info/top_level.txt,sha256=ddiI4HLBhY6ql-NNm0Ez0JhoOHdWDIzrHeCdHmmagcc,4
+pum-1.3.2.dist-info/RECORD,,