diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0995c10..76a9258 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -24,12 +24,12 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2.2.1 with: - python-version: 3.7 - architecture: x86 + python-version: 3.11 + architecture: amd64 - name: Install dependencies run: | pip install -e .[pyqt5] - pip install cx_freeze==6.5 + pip install cx_freeze~=6.15 pip install jinja2 choco install -y nsis.portable -version 3.02.0.20160720 - name: Build diff --git a/.gitignore b/.gitignore index 31fcace..cfb30e2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ dist/* .venv* .tox* venv* +win32install/*.exe +win32install/*.nsi diff --git a/cx_setup.py b/cx_setup.py index 979d2cc..c015333 100644 --- a/cx_setup.py +++ b/cx_setup.py @@ -13,7 +13,7 @@ ('lpstools\\assets\\*', 'assets\\') ] -setup(executables=[Executable("lpstools/gui.py", targetName="lpstool.exe", +setup(executables=[Executable("lpstools/gui.py", target_name="lpstool.exe", base="Win32GUI", icon="bitcraze.ico")], **setup_options) @@ -21,7 +21,7 @@ print("Custom copy:") if len(sys.argv) > 1 and sys.argv[1] == "build": for instr in files_to_copy: - destpath = "build\\exe.win32-3.7\\" + instr[1] + destpath = "build\\exe.win-amd64-3.11\\" + instr[1] print("Making folder {}".format(destpath)) os.makedirs(destpath, exist_ok=True) for filepath in glob.glob(instr[0]): diff --git a/setup.py b/setup.py index 0d94fdf..495755f 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setup_common import setup_options setup(extras_require={ - 'pyqt5': ['pyqt5==5.15'] + 'pyqt5': ['pyqt5~=5.15'] }, zip_safe=False, **setup_options) diff --git a/win32install/generate_nsis.py b/win32install/generate_nsis.py index a8fd9cc..bf52f2c 100644 --- a/win32install/generate_nsis.py +++ b/win32install/generate_nsis.py @@ -5,7 +5,7 @@ import jinja2 -DIST_PATH = "..\\build\\exe.win32-3.7" +DIST_PATH = "..\\build\\exe.win-amd64-3.11" EXCLUDED_FILES = ["Qt5WebEngineCore.dll", "qtwebengine_devtools_resources.pak"] # Get list of files and directory to install/uninstall diff --git a/win32install/lps-tools.nsi.tmpl b/win32install/lps-tools.nsi.tmpl index 3d04fa1..1c699c7 100644 --- a/win32install/lps-tools.nsi.tmpl +++ b/win32install/lps-tools.nsi.tmpl @@ -72,7 +72,7 @@ Section "Lps tools" SecLpsTools ; Files to install {% for file in files %} - File "/oname=$INSTDIR\{{file}}" "..\build\exe.win32-3.7\{{file}}" + File "/oname=$INSTDIR\{{file}}" "..\build\exe.win-amd64-3.11\{{file}}" {% endfor %} ; Write the installation path into the registry