diff --git a/.github/workflows/build_exe.yml b/.github/workflows/build_exe.yml index 21736fc2..48474cf0 100644 --- a/.github/workflows/build_exe.yml +++ b/.github/workflows/build_exe.yml @@ -19,7 +19,6 @@ jobs: run: | pip install .[all] pip install pyinstaller - pip install ttkbootstrap==1.10.1 - name: Build run: | echo "from daf_gui import run;run()" > discord-advert-framework.py diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 0eef9082..eb0fbf3c 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -37,6 +37,10 @@ Glossary Releases --------------------- +v4.0.5 +===================== +- Fixed exe build. + v4.0.4 ===================== - Fixed automatic responder's not being removable over a remote connection. diff --git a/requirements/mandatory.txt b/requirements/mandatory.txt index 60c11385..124ff6fc 100644 --- a/requirements/mandatory.txt +++ b/requirements/mandatory.txt @@ -4,4 +4,5 @@ typeguard>=2.13,<2.14 typing_extensions>=4,<5; python_version < "3.11" tkinter-async-execute>=1.2,<1.3 asyncio-event-hub>=1.0,<1.2 -tkclasswiz>=1.4,<1.5 \ No newline at end of file +tkclasswiz>=1.4,<1.5 +ttkbootstrap==1.10.1 diff --git a/src/daf/__init__.py b/src/daf/__init__.py index 1f160ae4..f9520ad3 100644 --- a/src/daf/__init__.py +++ b/src/daf/__init__.py @@ -22,7 +22,7 @@ import warnings -VERSION = "4.0.4" +VERSION = "4.0.5" if sys.version_info.minor == 12 and sys.version_info.major == 3: diff --git a/src/daf_gui/main.py b/src/daf_gui/main.py index 84bfb5cf..b7a5e860 100644 --- a/src/daf_gui/main.py +++ b/src/daf_gui/main.py @@ -14,41 +14,6 @@ import tk_async_execute as tae import json - -# Automatically install GUI requirements if GUI is requested to avoid making it an optional dependency -# One other way would be to create a completely different package on pypi for the core daf, but that is a lot of -# work to be done. It is better to auto install. -to_install = [ - ("ttkbootstrap", "==1.10.1"), -] - -version_path = Path.home().joinpath("./gui_versions.json") -if not version_path.exists(): - version_path.touch() - -with open(version_path, "r") as file: - try: - version_data = json.load(file) - except json.JSONDecodeError as exc: - version_data = {} - -for package, version in to_install: - installed_version = version_data.get(package, "0") - if find_spec(package) is None or installed_version != version: - print(f"Auto installing {package}{version}") - subprocess.check_call( - [ - sys.executable.replace("pythonw", "python"), - "-m", "pip", "install", "-U", - package + version - ] - ) - version_data[package] = version - -with open(version_path, "w") as file: - json.dump(version_data, file) - - import ttkbootstrap as ttk from tkclasswiz.convert import *