From c4de5099839bfd67704fdc4c7f925f485af91967 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 13 Mar 2023 09:19:26 -0400 Subject: [PATCH 1/9] fix failure to update to 2.3.2 - fixes #2930 #2941 --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index a255cef6f0b..47def20b38a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -140,6 +140,7 @@ version = {attr = "ldm.invoke.__version__"} "invokeai.assets.web", "invokeai.backend*", "invokeai.configs*", + "invokeai.configs.stable-diffusion*", "invokeai.frontend.dist*", "ldm*", ] From 1b62c781d78ccd94a9fbaafeab171b61627492b7 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 13 Mar 2023 09:33:32 -0400 Subject: [PATCH 2/9] temporarily disable run-patches --- ldm/invoke/CLI.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ldm/invoke/CLI.py b/ldm/invoke/CLI.py index 526f7c2352d..29dfd0813c1 100644 --- a/ldm/invoke/CLI.py +++ b/ldm/invoke/CLI.py @@ -66,7 +66,8 @@ def main(): Globals.ckpt_convert = args.ckpt_convert # run any post-install patches needed - run_patches() + # temporarily disabled + # run_patches() print(f">> Internet connectivity is {Globals.internet_available}") From 206593ec999d07017aa42e9a8bea6481ee44475d Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 13 Mar 2023 09:34:00 -0400 Subject: [PATCH 3/9] update version number --- ldm/invoke/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldm/invoke/_version.py b/ldm/invoke/_version.py index 579d8c1f84a..5eff1b9e33f 100644 --- a/ldm/invoke/_version.py +++ b/ldm/invoke/_version.py @@ -1,2 +1,2 @@ -__version__='2.3.2' +__version__='2.3.2.post1a' From c3d292e8f9581dfaa5e4382b9aa045eea270c290 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 13 Mar 2023 09:35:25 -0400 Subject: [PATCH 4/9] bump version to post1 --- ldm/invoke/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldm/invoke/_version.py b/ldm/invoke/_version.py index 5eff1b9e33f..de365d650bd 100644 --- a/ldm/invoke/_version.py +++ b/ldm/invoke/_version.py @@ -1,2 +1,2 @@ -__version__='2.3.2.post1a' +__version__='2.3.2.post1' From b7965e1ee67649d9ab545dc2858ba32a3f3b5347 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 13 Mar 2023 10:11:37 -0400 Subject: [PATCH 5/9] restore find-packages to pyproject.toml --- pyproject.toml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 47def20b38a..d8d3f2a46b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -136,19 +136,18 @@ license-files = ["LICENSE"] version = {attr = "ldm.invoke.__version__"} [tool.setuptools.packages.find] -"include" = [ - "invokeai.assets.web", - "invokeai.backend*", - "invokeai.configs*", - "invokeai.configs.stable-diffusion*", - "invokeai.frontend.dist*", - "ldm*", -] "where" = ["."] +"include" = [ + "invokeai.assets.web*", + "invokeai.backend*", + "invokeai.frontend.dist*", + "invokeai.configs*", + "ldm*"] [tool.setuptools.package-data] "invokeai.assets.web" = ["**.png"] -"invokeai.configs" = ["**.example", "**.txt", "**.yaml"] +"invokeai.backend" = ["**.png"] +"invokeai.configs" = ["*.example", "**/*.yaml", "*.txt"] "invokeai.frontend.dist" = ["**"] [tool.black] From 6db509a4ff049589692effc6604ae94764cae893 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 13 Mar 2023 10:15:33 -0400 Subject: [PATCH 6/9] add --upgrade to update script --- ldm/invoke/config/invokeai_update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldm/invoke/config/invokeai_update.py b/ldm/invoke/config/invokeai_update.py index 8ad72901364..ef5beb85832 100644 --- a/ldm/invoke/config/invokeai_update.py +++ b/ldm/invoke/config/invokeai_update.py @@ -72,7 +72,7 @@ def main(): tag = Prompt.ask('Enter an InvokeAI tag or branch name') print(f':crossed_fingers: Upgrading to [yellow]{tag}[/yellow]') - cmd = f'pip install {INVOKE_AI_SRC}/{tag}.zip --use-pep517' + cmd = f'pip install {INVOKE_AI_SRC}/{tag}.zip --use-pep517 --upgrade' print('') print('') if os.system(cmd)==0: From eee7f137716f36834dac0792b27aec8f0f20919c Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 13 Mar 2023 10:35:39 -0400 Subject: [PATCH 7/9] add back stable diffusion config files --- pyproject.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d8d3f2a46b6..d5c8c031634 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -136,18 +136,18 @@ license-files = ["LICENSE"] version = {attr = "ldm.invoke.__version__"} [tool.setuptools.packages.find] -"where" = ["."] "include" = [ - "invokeai.assets.web*", - "invokeai.backend*", - "invokeai.frontend.dist*", - "invokeai.configs*", - "ldm*"] + "invokeai.assets.web", + "invokeai.backend*", + "invokeai.configs*", + "invokeai.frontend.dist*", + "ldm*", +] +"where" = ["."] [tool.setuptools.package-data] "invokeai.assets.web" = ["**.png"] -"invokeai.backend" = ["**.png"] -"invokeai.configs" = ["*.example", "**/*.yaml", "*.txt"] +"invokeai.configs" = ["**.example", "**.txt", "**.yaml", "**/*.yaml"] "invokeai.frontend.dist" = ["**"] [tool.black] From 1f80b5335bca3de3a299ef6e13bfd540d86349ab Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 13 Mar 2023 10:38:08 -0400 Subject: [PATCH 8/9] reenable run_patches() --- ldm/invoke/CLI.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldm/invoke/CLI.py b/ldm/invoke/CLI.py index 29dfd0813c1..1d8c2607df3 100644 --- a/ldm/invoke/CLI.py +++ b/ldm/invoke/CLI.py @@ -67,7 +67,7 @@ def main(): # run any post-install patches needed # temporarily disabled - # run_patches() + run_patches() print(f">> Internet connectivity is {Globals.internet_available}") From 16dea46b79d538b8d9fc31bdf860ed1cb580a216 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 13 Mar 2023 12:51:27 -0400 Subject: [PATCH 9/9] remove outdated comment --- ldm/invoke/CLI.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ldm/invoke/CLI.py b/ldm/invoke/CLI.py index 1d8c2607df3..526f7c2352d 100644 --- a/ldm/invoke/CLI.py +++ b/ldm/invoke/CLI.py @@ -66,7 +66,6 @@ def main(): Globals.ckpt_convert = args.ckpt_convert # run any post-install patches needed - # temporarily disabled run_patches() print(f">> Internet connectivity is {Globals.internet_available}")