From 61f6479ea9a85fd12b830be2dfe71a51db34b121 Mon Sep 17 00:00:00 2001 From: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon, 22 Apr 2024 12:19:30 +0300 Subject: [PATCH 1/3] restore 1.8.0-style naming of scripts --- modules/script_loading.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/script_loading.py b/modules/script_loading.py index 7cbba71de..cccb30966 100644 --- a/modules/script_loading.py +++ b/modules/script_loading.py @@ -8,9 +8,7 @@ loaded_scripts = {} def load_module(path): - module_name, _ = os.path.splitext(os.path.basename(path)) - full_module_name = "scripts." + module_name - module_spec = importlib.util.spec_from_file_location(full_module_name, path) + module_spec = importlib.util.spec_from_file_location(os.path.basename(path), path) module = importlib.util.module_from_spec(module_spec) module_spec.loader.exec_module(module) From e9809de6512160501e34c54e9c8c5e5e493e306f Mon Sep 17 00:00:00 2001 From: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Mon, 22 Apr 2024 18:21:48 +0900 Subject: [PATCH 2/3] restore 1.8.0-style naming of scripts --- extensions-builtin/hypertile/scripts/hypertile_xyz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions-builtin/hypertile/scripts/hypertile_xyz.py b/extensions-builtin/hypertile/scripts/hypertile_xyz.py index 386c6b2d6..9e96ae3c5 100644 --- a/extensions-builtin/hypertile/scripts/hypertile_xyz.py +++ b/extensions-builtin/hypertile/scripts/hypertile_xyz.py @@ -1,7 +1,7 @@ from modules import scripts from modules.shared import opts -xyz_grid = [x for x in scripts.scripts_data if x.script_class.__module__ == "scripts.xyz_grid"][0].module +xyz_grid = [x for x in scripts.scripts_data if x.script_class.__module__ == "xyz_grid.py"][0].module def int_applier(value_name:str, min_range:int = -1, max_range:int = -1): """ From e837124f4b1b9dcf3caccd8d2fa5730cf3df099a Mon Sep 17 00:00:00 2001 From: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon, 22 Apr 2024 12:26:05 +0300 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0137f38f..d7bcef0bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.9.2 + +### Extensions and API: +* restore 1.8.0-style naming of scripts + ## 1.9.1 ### Minor: