diff --git a/bread_editor/__init__.py b/bread_editor/__init__.py index 23d4ce1..a93a4bf 100644 --- a/bread_editor/__init__.py +++ b/bread_editor/__init__.py @@ -1,3 +1 @@ #!/usr/bin/python3 - -from bread_editor.main import start_from_command_line diff --git a/bread_editor/gui/raw_ui/ui_to_py.py b/bread_editor/gui/raw_ui/ui_to_py.py index ac953c1..a28a93c 100644 --- a/bread_editor/gui/raw_ui/ui_to_py.py +++ b/bread_editor/gui/raw_ui/ui_to_py.py @@ -7,9 +7,13 @@ working_dir = os.getcwd() if not working_dir.split('/')[-1] == "raw_ui": # cd into the right directory if this gets executed from somewhere else os.chdir(os.path.dirname(os.path.abspath(__file__))) -input_debug = input("Do you want to debug the gui scripts? (Make gui scripts executable.) (y/n): ") +if __name__ == "__main__": # dont ask for debug on setup + input_debug = input("Do you want to debug the gui scripts? (Make gui scripts executable.) (y/n): ") -debug = input_debug == "y" + debug = input_debug == "y" + +else: + debug = False params = "-o" if debug: @@ -19,5 +23,10 @@ paths = { "main_window.ui": "main_window.py" } -for ui_file, script_out in paths.items(): - os.system(f"pyuic6 {ui_file} {params} ../{script_out}") + +def convert_ui(): + for ui_file, script_out in paths.items(): + os.system(f"pyuic6 {ui_file} {params} ../{script_out}") + + +os.chdir(working_dir) # switch back to the working directory from which the script was executed diff --git a/setup.py b/setup.py index cf18162..bf7f6c7 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,11 @@ #!/usr/bin/python3 import setuptools +from bread_editor.gui.raw_ui import ui_to_py from pathlib import Path +ui_to_py.convert_ui() # convert the .ui files to .py files before setup + this_directory = Path(__file__).parent # use readme file as long description long_description = (this_directory / "README.md").read_text() @@ -15,13 +18,13 @@ setuptools.setup( url="https://teapot.informationsanarchistik.de/Wobbl/Bread_Editor", author="The Wobbler", author_email="emil@i21k.de", - packages=["bread_editor"], + packages=["bread_editor", "bread_editor.gui"], package_data={"": ["*.ui", "*.txt"]}, install_requires=[ "PyQt6", "wobbl_tools @ git+https://teapot.informationsanarchistik.de/Wobbl/wobbl_tools@main#egg=wobbl_tools" ], entry_points={ - "console_scripts": ["bread_editor=bread_editor:start_from_command_line"], + "console_scripts": ["bread_editor=bread_editor.main:start_from_command_line"], } )