diff --git a/qpt/executor.py b/qpt/executor.py index 003a75b..8482a52 100644 --- a/qpt/executor.py +++ b/qpt/executor.py @@ -154,8 +154,14 @@ def make(self): # 复制Debug所需文件 if self.with_debug: debug_dir = os.path.join(os.path.split(qpt.__file__)[0], "ext/launcher_debug") - shutil.copytree(debug_dir, dst=self.debug_path, dirs_exist_ok=True) - shutil.copytree(self.module_path, dst=self.debug_path, dirs_exist_ok=True) + try: + shutil.copytree(debug_dir, dst=self.debug_path, dirs_exist_ok=True) + shutil.copytree(self.module_path, dst=self.debug_path, dirs_exist_ok=True) + except TypeError: + shutil.copytree(debug_dir, dst=self.debug_path) + shutil.copytree(self.module_path, dst=self.debug_path) + Logging.debug("打包策略将对Python3.7版本进行支持") + # 生成Debug标识符 unlock_file_path = os.path.join(self.debug_path, "configs/unlock.cache") with open(unlock_file_path, "w", encoding="utf-8") as unlock_file: @@ -165,7 +171,10 @@ def make(self): # 复制Release启动器文件 launcher_dir = os.path.join(os.path.split(qpt.__file__)[0], "ext/launcher") - shutil.copytree(launcher_dir, dst=self.module_path, dirs_exist_ok=True) + try: + shutil.copytree(launcher_dir, dst=self.module_path, dirs_exist_ok=True) + except TypeError: + shutil.copytree(launcher_dir, dst=self.module_path) os.rename(os.path.join(self.module_path, "compatibility_mode.cmd"), os.path.join(self.module_path, "使用兼容模式运行.cmd")) os.rename(os.path.join(self.module_path, "main.exe"), diff --git a/qpt/modules/qpt_kernel_dependency.txt b/qpt/modules/qpt_kernel_dependency.txt index dcd4803..ac1cd18 100644 --- a/qpt/modules/qpt_kernel_dependency.txt +++ b/qpt/modules/qpt_kernel_dependency.txt @@ -1,4 +1,4 @@ -qpt==1.0a4 +qpt==1.0a5 pyqt5==5.15.4 pyqt5-Qt5==5.15.2 pyqt5-sip==12.9.0 diff --git a/setup.py b/setup.py index 91e0309..fe12ab0 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ # python setup.py sdist bdist_wheel setup( name='QPT', - version='1.0a4', + version='1.0a5', packages=find_packages(), url='https://github.com/GT-ZhangAcer/QPT', license='LGPL',