From 77e50a63317fd742b3a1a8a01ec92a4364f7bcbf Mon Sep 17 00:00:00 2001 From: Dene33 Date: Mon, 27 Nov 2023 23:32:14 +0100 Subject: [PATCH] spec update --- build_specs/linux_mac_directory.spec | 62 +++++----------------------- build_specs/win_directory.spec | 4 -- 2 files changed, 11 insertions(+), 55 deletions(-) diff --git a/build_specs/linux_mac_directory.spec b/build_specs/linux_mac_directory.spec index b32d178..e4cfe16 100644 --- a/build_specs/linux_mac_directory.spec +++ b/build_specs/linux_mac_directory.spec @@ -21,78 +21,38 @@ def get_sitepackages(sitepackages: Path): return datas - -sys.path = sys.path[-3:] - -print(sys.path) - sitepackages = Path.absolute(Path(sysconfig.get_paths()["purelib"])) sitepackages_list = get_sitepackages(sitepackages) shiny = sitepackages / "shiny" -# shinyswatch = sitepackages / "shinyswatch" -# yamldataclassconfig = sitepackages / "yamldataclassconfig" -# dataclasses_json = sitepackages / "dataclasses_json" -# marshmallow = sitepackages / "marshmallow" langchain = sitepackages / "langchain" -# typing_inspect = sitepackages / "typing_inspect.py" -# mypy_extensions = sitepackages / "mypy_extensions.py" -# marshmallow_enum = sitepackages / "marshmallow_enum" www = os.path.abspath("www") data = os.path.abspath("data") data_files = [ - ("app.py", "."), - ("validators.py", "."), - ("utils.py", "."), - ("settings.yaml", "."), - ("resources_paths.py", "."), - ("prompts.py", "."), - ("pages.py", "."), - ("LICENSE.md", "."), - ("classes.py", "."), - ("__init__.py", "."), + ("../app.py", "."), + ("../validators.py", "."), + ("../utils.py", "."), + ("../settings.yaml", "."), + ("../resources_paths.py", "."), + ("../prompts.py", "."), + ("../pages.py", "."), + ("../LICENSE.md", "."), + ("../classes.py", "."), + ("../__init__.py", "."), (data, "./data"), (www, "./www"), - # (langchain, "./langchain"), - # (shiny, "./shiny"), ] datas = data_files + sitepackages_list -# print(datas) - a = Analysis( - ["story_generator.py"], + ["../story_generator.py"], pathex=[sitepackages], binaries=[], datas=datas, - # datas=[ - # ("app.py", "."), - # ("validators.py", "."), - # ("utils.py", "."), - # ("settings.yaml", "."), - # ("resources_paths.py", "."), - # ("prompts.py", "."), - # ("pages.py", "."), - # ("LICENSE.md", "."), - # ("classes.py", "."), - # ("__init__.py", "."), - # ("data", "data"), - # ("www", "www"), - # # (sitepackages, "site-packages"), - # (langchain, "./langchain"), - # (shiny, "./shiny"), - # (shinyswatch, "./shinyswatch"), - # (yamldataclassconfig, "./yamldataclassconfig"), - # (dataclasses_json, "./dataclasses_json"), - # (marshmallow, "./marshmallow"), - # (typing_inspect, "."), - # (mypy_extensions, "."), - # (marshmallow_enum, "./marshmallow_enum"), - # ], hiddenimports=[ "shiny", "shinyswatch", diff --git a/build_specs/win_directory.spec b/build_specs/win_directory.spec index 8ded114..b9177a2 100644 --- a/build_specs/win_directory.spec +++ b/build_specs/win_directory.spec @@ -25,8 +25,6 @@ sitepackages = Path.absolute(Path(sysconfig.get_paths()["purelib"])) sitepackages_list = get_sitepackages(sitepackages) -print(sitepackages_list) - shiny = sitepackages / "shiny" langchain = sitepackages / "langchain" www = os.path.abspath("www") @@ -49,8 +47,6 @@ data_files = [ datas = data_files + sitepackages_list -current_path = os.getcwd() -print(current_path) a = Analysis( ["../story_generator.py"],