2 Commits
v1.6.4 ... main

Author SHA1 Message Date
AccentuSoft
16be1c5ee4 Bump python to 3.13, and app version 2025-02-06 14:43:30 +02:00
AccentuSoft
7346a42227 Move to using Fusion theme for app 2025-02-06 14:40:01 +02:00
8 changed files with 16 additions and 18 deletions

View File

@@ -34,7 +34,7 @@ class ModulesManager:
self.browsersBaseDirectoryPath.mkdir(exist_ok=True) self.browsersBaseDirectoryPath.mkdir(exist_ok=True)
self.modulesRequirementsPath = self.modulesBaseDirectoryPath / "requirements.txt" self.modulesRequirementsPath = self.modulesBaseDirectoryPath / "requirements.txt"
self.modulesRequirementsTempPath = self.modulesBaseDirectoryPath / "requirements.txt.tmp" self.modulesRequirementsTempPath = self.modulesBaseDirectoryPath / "requirements.txt.tmp"
self.modulesPythonPath = self.modulesBaseDirectoryPath / 'bin' / 'python3.11' if self.system == "Linux" \ self.modulesPythonPath = self.modulesBaseDirectoryPath / 'bin' / 'python3.13' if self.system == "Linux" \
else self.modulesBaseDirectoryPath / 'Scripts' / 'python.exe' else self.modulesBaseDirectoryPath / 'Scripts' / 'python.exe'
self.upgradeThread = None self.upgradeThread = None
self.moduleReqsThread = None self.moduleReqsThread = None
@@ -808,7 +808,7 @@ class InitialiseVenvThread(QtCore.QThread):
if self.modulesManager.system == "Linux" \ if self.modulesManager.system == "Linux" \
else self.modulesManager.modulesBaseDirectoryPath / 'Scripts' else self.modulesManager.modulesBaseDirectoryPath / 'Scripts'
if not binPath.exists(): if not binPath.exists():
pythonExecutable = "python3.11" if self.modulesManager.system == "Linux" else "python.exe" pythonExecutable = "python3.13" if self.modulesManager.system == "Linux" else "python.exe"
cmdStr = (f'{pythonExecutable} -m venv --symlinks --clear --upgrade-deps ' cmdStr = (f'{pythonExecutable} -m venv --symlinks --clear --upgrade-deps '
f'"{self.modulesManager.modulesBaseDirectoryPath}"') f'"{self.modulesManager.modulesBaseDirectoryPath}"')
subprocess.run(cmdStr, shell=True) subprocess.run(cmdStr, shell=True)

View File

@@ -23,7 +23,7 @@ class SettingsObject(dict):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
self.globalSettings = QSettings() self.globalSettings = QSettings()
self.globalSettings.setValue("Program/Version", "v1.6.4") self.globalSettings.setValue("Program/Version", "v1.6.5")
self.globalSettings.setValue("Program/TOR Profile Location", self.globalSettings.setValue("Program/TOR Profile Location",
self.globalSettings.value("Program/TOR Profile Location", "")) self.globalSettings.value("Program/TOR Profile Location", ""))
self.globalSettings.setValue("Program/BaseDir", self.globalSettings.setValue("Program/BaseDir",

View File

@@ -24,7 +24,7 @@ from PySide6 import QtCore, QtWidgets, QtGui
python -m nuitka --follow-imports --onefile --noinclude-pytest-mode=nofollow --noinclude-setuptools-mode=nofollow ^ python -m nuitka --follow-imports --onefile --noinclude-pytest-mode=nofollow --noinclude-setuptools-mode=nofollow ^
--noinclude-custom-mode=setuptools:error --noinclude-IPython-mode=nofollow --enable-plugin=pyside6 ^ --noinclude-custom-mode=setuptools:error --noinclude-IPython-mode=nofollow --enable-plugin=pyside6 ^
--assume-yes-for-downloads --remove-output --windows-console-mode=disable --warn-unusual-code --show-modules ^ --assume-yes-for-downloads --remove-output --windows-console-mode=disable --warn-unusual-code --show-modules ^
--windows-company-name="AccentuSoft" --windows-product-name="LinkScope Installer" --windows-product-version=1.6.4.0 ^ --windows-company-name="AccentuSoft" --windows-product-name="LinkScope Installer" --windows-product-version=1.6.5.0 ^
--include-data-files="Icon.ico=Icon.ico" --windows-icon-from-ico=".\Icon.ico" ^ --include-data-files="Icon.ico=Icon.ico" --windows-icon-from-ico=".\Icon.ico" ^
--windows-file-description="LinkScope Installer" ^ --windows-file-description="LinkScope Installer" ^
Installer.py Installer.py
@@ -779,8 +779,8 @@ def installGraphvizWindowsHelper():
def installPythonLinuxHelper(): def installPythonLinuxHelper():
subprocess.run('echo "y" | add-apt-repository ppa:deadsnakes/ppa', shell=True) subprocess.run('echo "y" | add-apt-repository ppa:deadsnakes/ppa', shell=True)
subprocess.run('apt-get update && apt-get install python3.11 python3.11-venv -y', shell=True) subprocess.run('apt-get update && apt-get install python3.13 python3.13-venv -y', shell=True)
subprocess.run('wget -O - https://bootstrap.pypa.io/get-pip.py | python3.11', shell=True) subprocess.run('wget -O - https://bootstrap.pypa.io/get-pip.py | python3.13', shell=True)
def installPythonWindowsHelper(): def installPythonWindowsHelper():
@@ -790,7 +790,7 @@ def installPythonWindowsHelper():
return False return False
latest_release_path = win_downloads.text.split( latest_release_path = win_downloads.text.split(
'Latest Python 3 Release -', 1)[0].split('href="')[-1].split('"', 1)[0] 'Python 3.13.', 1)[0].split('href="')[-1].split('"', 1)[0]
latest_release_full_path = f'https://www.python.org{latest_release_path}' latest_release_full_path = f'https://www.python.org{latest_release_path}'
@@ -1031,7 +1031,7 @@ class InstallWizard(QtWidgets.QWizard):
if self.currentOS == 'Linux': if self.currentOS == 'Linux':
try: try:
if subprocess.run(["python3.11", "--version"], if subprocess.run(["python3.13", "--version"],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
text=True).returncode != 0: text=True).returncode != 0:

View File

@@ -10,7 +10,6 @@ import itertools
import threading import threading
import networkx as nx import networkx as nx
import qdarktheme
from ast import literal_eval from ast import literal_eval
from uuid import uuid4 from uuid import uuid4
from shutil import move from shutil import move
@@ -3251,6 +3250,6 @@ if __name__ == '__main__':
application = QtWidgets.QApplication(sys.argv) application = QtWidgets.QApplication(sys.argv)
application.setOrganizationName("AccentuSoft") application.setOrganizationName("AccentuSoft")
application.setApplicationName("LinkScope Client") application.setApplicationName("LinkScope Client")
qdarktheme.setup_theme() application.setStyle('fusion')
mainWindow = MainWindow() mainWindow = MainWindow()
sys.exit(application.exec()) sys.exit(application.exec())

View File

@@ -42,7 +42,7 @@ Note that the SFDP graph layout does not function on Windows, as an essential gr
Since Version 1.0.0, installers are provided for Windows 11 and Linux (Ubuntu) platforms. Since Version 1.0.0, installers are provided for Windows 11 and Linux (Ubuntu) platforms.
Download the latest installer for your platform from the Releases page, and run it to install the software: Download the latest installer for your platform from the Releases page, and run it to install the software:
https://github.com/AccentuSoft/LinkScope_Client/releases/tag/v1.6.2 https://github.com/AccentuSoft/LinkScope_Client/releases/tag/v1.6.5
Note: On Ubuntu, you may need to mark the downloaded installer as executable before you can run it. To do this, right-click the installer, and from the drop-down menu, select 'properties'. On the dialog window that pops up, navigate to the 'Permissions' tab, and make sure that 'Allow executing file as program' is checked. You should at this point be able to run the installer by double-clicking it. If double-clicking the installer does not start it, you can also launch the installer through a terminal. Note: On Ubuntu, you may need to mark the downloaded installer as executable before you can run it. To do this, right-click the installer, and from the drop-down menu, select 'properties'. On the dialog window that pops up, navigate to the 'Permissions' tab, and make sure that 'Allow executing file as program' is checked. You should at this point be able to run the installer by double-clicking it. If double-clicking the installer does not start it, you can also launch the installer through a terminal.

View File

@@ -4,7 +4,7 @@
# to a new directory along with this file. # to a new directory along with this file.
# Then, run the script. # Then, run the script.
PYTHON_VER=3.11 PYTHON_VER=3.13
python${PYTHON_VER} -m venv buildEnv python${PYTHON_VER} -m venv buildEnv
@@ -25,7 +25,7 @@ python${PYTHON_VER} -m nuitka --follow-imports --standalone --noinclude-pytest-m
--include-data-dir="Core/Entities=Core/Entities" \ --include-data-dir="Core/Entities=Core/Entities" \
--warn-unusual-code --show-modules --include-data-files="Icon.ico=Icon.ico" \ --warn-unusual-code --show-modules --include-data-files="Icon.ico=Icon.ico" \
--linux-icon="Icon.ico" \ --linux-icon="Icon.ico" \
--include-package-data=playwright \ --include-package-data=requests \
--include-package-data=folium --include-package-data=branca \ --include-package-data=folium --include-package-data=branca \
--include-package=dns \ --include-package=dns \
--include-package-data=pycountry \ --include-package-data=pycountry \

View File

@@ -8,7 +8,7 @@
:: UpdaterUtil.py and PatchMagicWin.py to a new directory along with this file. :: UpdaterUtil.py and PatchMagicWin.py to a new directory along with this file.
:: Then, run the script. :: Then, run the script.
SET PYTHON_VER=3.11 SET PYTHON_VER=3.13
python -m venv buildEnv python -m venv buildEnv
@@ -31,9 +31,9 @@ python -m nuitka --follow-imports --standalone --noinclude-pytest-mode=nofollow
--include-data-dir="Core\Entities=Core\Entities" ^ --include-data-dir="Core\Entities=Core\Entities" ^
--warn-unusual-code --show-modules --include-data-files="Icon.ico=Icon.ico" ^ --warn-unusual-code --show-modules --include-data-files="Icon.ico=Icon.ico" ^
--windows-icon-from-ico=".\Icon.ico" --include-data-dir="magic=magic" --windows-company-name=AccentuSoft ^ --windows-icon-from-ico=".\Icon.ico" --include-data-dir="magic=magic" --windows-company-name=AccentuSoft ^
--windows-product-name="LinkScope Client" --windows-product-version="1.6.4.0" ^ --windows-product-name="LinkScope Client" --windows-product-version="1.6.5.0" ^
--windows-file-description="LinkScope Client Software" ^ --windows-file-description="LinkScope Client Software" ^
--include-package-data=playwright ^ --include-package-data=requests ^
--include-package-data=folium --include-package-data=branca ^ --include-package-data=folium --include-package-data=branca ^
--include-package=dns ^ --include-package=dns ^
--include-package-data=pycountry ^ --include-package-data=pycountry ^
@@ -46,7 +46,7 @@ python -m nuitka --onefile --noinclude-pytest-mode=nofollow ^
--noinclude-unittest-mode=nofollow --assume-yes-for-downloads --remove-output ^ --noinclude-unittest-mode=nofollow --assume-yes-for-downloads --remove-output ^
--nofollow-import-to=tkinter ^ --nofollow-import-to=tkinter ^
--warn-unusual-code ^ --warn-unusual-code ^
--windows-company-name=AccentuSoft --windows-product-version="1.6.4.0" ^ --windows-company-name=AccentuSoft --windows-product-version="1.6.5.0" ^
--windows-product-name="LinkScope Client Updater" --windows-file-description="LinkScope Client Updater" ^ --windows-product-name="LinkScope Client Updater" --windows-file-description="LinkScope Client Updater" ^
".\UpdaterUtil.py" ".\UpdaterUtil.py"

View File

@@ -1,5 +1,4 @@
PySide6 PySide6
pyqtdarktheme
# For python-magic, the following packages may be required: # For python-magic, the following packages may be required: