Skip to content

Commit

Permalink
#19: Update python version to 3.11 amd64
Browse files Browse the repository at this point in the history
  • Loading branch information
ataffanel committed Nov 30, 2023
1 parent f614861 commit 5bb8a6b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/[email protected]
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
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ dist/*
.venv*
.tox*
venv*
win32install/*.exe
win32install/*.nsi
4 changes: 2 additions & 2 deletions cx_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
('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)

print()
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]):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion win32install/generate_nsis.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion win32install/lps-tools.nsi.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5bb8a6b

Please sign in to comment.