From f9780c5942dd7100953a8e8e3da13e8fac35f5b2 Mon Sep 17 00:00:00 2001 From: Gleed Date: Fri, 17 Jun 2022 10:00:05 -0400 Subject: [PATCH] Bugfix: Build process (#887) * Bump version to v0.8.0 * Bump version to v0.8.0 * init * vers --- build.py | 2 +- environment.yml | 2 +- src/nip/actions.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.py b/build.py index c314d98..e188c05 100644 --- a/build.py +++ b/build.py @@ -76,7 +76,7 @@ if __name__ == "__main__": if args.use_key: key = Fernet.generate_key().decode("utf-8") key_cmd = " --key " + key - installer_cmd = f"pyinstaller --onefile --distpath {botty_dir}{key_cmd} --exclude-module graphviz --paths .\\src --paths {args.conda_path}\\envs\\botty\\lib\\site-packages src\\{exe}" + installer_cmd = f"pyinstaller --onefile --distpath {botty_dir}{key_cmd} --exclude-module graphviz --paths .\\src --paths {args.conda_path}\\envs\\botty\\Lib\\site-packages src\\{exe}" os.system(installer_cmd) os.system(f"cd {botty_dir} && mkdir config && cd ..") diff --git a/environment.yml b/environment.yml index 345de50..4bd3963 100644 --- a/environment.yml +++ b/environment.yml @@ -11,7 +11,7 @@ dependencies: - rapidfuzz - pip: - pyinstaller - - opencv-python + - opencv-python==4.5.5.64 - transitions - mss - numpy diff --git a/src/nip/actions.py b/src/nip/actions.py index 20d829e..230af16 100644 --- a/src/nip/actions.py +++ b/src/nip/actions.py @@ -213,8 +213,8 @@ def _load_nip_expressions(filepath): break -default_nip_file_path = os.path.join(os.path.abspath(os.path.join(os.path.join(os.path.dirname(__file__), os.pardir), os.pardir)), 'config/default.nip') -nip_path = os.path.join(os.path.abspath(os.path.join(os.path.join(os.path.dirname(__file__), os.pardir), os.pardir)), 'config/nip') +default_nip_file_path = f"{os.getcwd()}/config/default.nip" +nip_path = f"{os.getcwd()}/config/nip" glob_nip_path = os.path.join(nip_path, '**', '*.nip') nip_file_paths = glob.glob(glob_nip_path, recursive=True)