Skip to content

Commit

Permalink
Merge pull request #847 from cedricp/py_3_11
Browse files Browse the repository at this point in the history
migrate to python 3.11
  • Loading branch information
Furtif authored Jun 11, 2023
2 parents efc859b + d7f04ca commit b04f7f8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ Using the application in non expert mode should not be harmful for your vehicle

## `Cloning Source Code`
### `Dependencies :`
![python_3.10.x](icons/py3_engaged.png)
* [Python 3.10](https://www.python.org/downloads/release/python-3105/)
![python_3.11.x](icons/py3_engaged.png)
* [Python 3.11](https://www.python.org/downloads/release/python-3110/)
* [PyQt 5](https://pypi.org/project/PyQt5/)
* [pyusb](https://pypi.org/project/pyusb/)
* [pyserial](https://pypi.org/project/pyserial/)
Expand Down Expand Up @@ -92,6 +92,8 @@ Get the fully packaged installer here : [Release area](https://github.com/cedric

## Informations

DataBase not included, do not forget to install database as zip or full mode in to root clone repo.

Bugtracking here : https://github.com/cedricp/ddt4all

Happy CAN-Hacking :)
Expand Down
Binary file modified icons/py3_engaged.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion options.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ def translator(filename):
pass

# Set up message catalog access
t = gettext.translation(filename, 'locale', fallback=True, codeset="utf-8")
t = gettext.translation(filename, 'locale', fallback=True) # not ok in python 3.11.x, codeset="utf-8")
return t.gettext
8 changes: 5 additions & 3 deletions wininstaller.iss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ UsePreviousPrivileges=True
//Source: "ecu.zip"; DestDir: "{app}"; Flags: onlyifdoesntexist skipifsourcedoesntexist
Source: "*.py"; DestDir: "{app}"
Source: "*.qss"; DestDir: "{app}"
Source: "\Python39-32\*"; DestDir: "{app}\Python39"; Flags: ignoreversion recursesubdirs; Excludes: "*.pyc"
Source: "\Python311\*"; DestDir: "{app}\Python311"; Flags: ignoreversion recursesubdirs; Excludes: "*.pyc"
Source: "ddtplugins\*"; DestDir: "{app}\ddtplugins"; Flags: ignoreversion recursesubdirs; Excludes: "*.pyc"
Source: "icons\*"; DestDir: "{app}\icons"; Flags: ignoreversion recursesubdirs
Source: "address\*"; DestDir: "{app}\address"; Flags: ignoreversion recursesubdirs
Expand All @@ -60,6 +60,8 @@ Source: "json\*"; DestDir: "{app}\json"; Flags: ignoreversion recursesubdirs onl
Type: filesandordirs; Name: "{app}\importlib"
Type: filesandordirs; Name: "{app}\python27"
Type: filesandordirs; Name: "{app}\Python38"
Type: filesandordirs; Name: "{app}\Python39"
Type: filesandordirs; Name: "{app}\Python310"

[Code]
procedure AfterMyProgInstall;
Expand All @@ -77,8 +79,8 @@ Name: "{app}\vehicles"; Permissions: users-full
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}";GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked

[Icons]
Name: "{group}\ddt4all"; Filename: "{app}\Python39\python.exe"; Parameters: """{app}\main.py"""; WorkingDir: "{app}"; IconFilename: "{app}\icons\obd.ico"
Name: "{userdesktop}\ddt4all"; Filename: "{app}\Python39\python.exe"; Parameters: """{app}\main.py"""; WorkingDir: "{app}"; IconFilename: "{app}\icons\obd.ico"; Tasks: desktopicon
Name: "{group}\ddt4all"; Filename: "{app}\Python311\python.exe"; Parameters: """{app}\main.py"""; WorkingDir: "{app}"; IconFilename: "{app}\icons\obd.ico"
Name: "{userdesktop}\ddt4all"; Filename: "{app}\Python311\python.exe"; Parameters: """{app}\main.py"""; WorkingDir: "{app}"; IconFilename: "{app}\icons\obd.ico"; Tasks: desktopicon

[CustomMessages]
en.AfterMyProgInstall=Do not forget to install database to %n%n
Expand Down

0 comments on commit b04f7f8

Please # to comment.