From 77e84b217e16b7ff722311bd17d0ab1e839b0b46 Mon Sep 17 00:00:00 2001 From: SimplifiedPrivacy Date: Thu, 21 May 2026 16:25:02 -0400 Subject: [PATCH] Added explicit AppRun lines about APPDIR and python directory. Updated the requirements.txt as well --- VERSION | 2 +- client/AppRun | 10 ++++-- full_list.txt | 27 +++++++++++++++ old_requirements.txt | 57 +++++++++++++++++++++++++++++++ pyproject.toml | 57 +++++++++++++++++++++++++++++++ requirements.txt | 33 +++++++++++++++++- script_to_extract_dependencies.py | 12 +++++++ 7 files changed, 193 insertions(+), 5 deletions(-) create mode 100644 full_list.txt create mode 100644 old_requirements.txt create mode 100644 pyproject.toml create mode 100644 script_to_extract_dependencies.py diff --git a/VERSION b/VERSION index c043eea..a6333e4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.1 +2.2.9 diff --git a/client/AppRun b/client/AppRun index b5d40f8..497b7fb 100755 --- a/client/AppRun +++ b/client/AppRun @@ -1,11 +1,16 @@ #!/bin/bash +# new line: +APPDIR="$(dirname "$(readlink -f "$0")")" + export HV_CLIENT_PATH="$APPIMAGE" hv_client_version_number="$(cat "${APPDIR}/VERSION")" export HV_CLIENT_VERSION_NUMBER="$hv_client_version_number" -export PYTHONPATH="${APPDIR}/usr/lib/python3.12" +# new folder update: +export PYTHONPATH="${APPDIR}/usr/lib/python3.12/site-packages:${PYTHONPATH}" +# export PYTHONPATH="${APPDIR}/usr/lib/python3.12" export LD_LIBRARY_PATH="${APPDIR}/usr/lib/x86_64-linux-gnu" export PATH="${APPDIR}/usr/bin:${PATH}" @@ -21,10 +26,9 @@ fi if [ ! -d "${data_directory}/runtime" ]; then mkdir -p "${data_directory}/runtime" + tar -xzf "$APPDIR/usr/share/packages/sp-hydra-veil-runtime-x86_64.tar.gz" -C "${data_directory}/runtime" fi -tar -xzf "$APPDIR/usr/share/packages/sp-hydra-veil-runtime-x86_64.tar.gz" -C "${data_directory}/runtime" - configuration_directory="${XDG_CONFIG_HOME:-$HOME/.config}/hydra-veil" profile_directory="$configuration_directory/profiles" diff --git a/full_list.txt b/full_list.txt new file mode 100644 index 0000000..bdfc7ac --- /dev/null +++ b/full_list.txt @@ -0,0 +1,27 @@ +certifi==2026.2.25 +cffi==2.0.0 +charset-normalizer==3.4.6 +cryptography==46.0.5 +dataclasses-json==0.6.7 +idna==3.11 +marshmallow==3.26.2 +mypy_extensions==1.1.0 +packaging==26.0 +pillow==11.3.0 +psutil==7.1.3 +pycparser==3.0 +pyperclip==1.9.0 +PyQt6==6.7.1 +PyQt6-Qt6==6.7.3 +PyQt6_sip==13.10.0 +PySocks==1.7.1 +python-dateutil==2.9.0.post0 +qrcode==8.2 +requests==2.32.5 +six==1.17.0 +sp-hydra-veil-core==2.2.1 +sp-hydra-veil-gui @ file:///home/a/Python/sp-hydra-veil-gui +stem==1.8.2 +typing-inspect==0.9.0 +typing_extensions==4.15.0 +urllib3==2.6.3 diff --git a/old_requirements.txt b/old_requirements.txt new file mode 100644 index 0000000..12a63ca --- /dev/null +++ b/old_requirements.txt @@ -0,0 +1,57 @@ +--index-url https://git.simplifiedprivacy.com/api/packages/codeking/pypi/simple/ +sp-hydra-veil-cli==2.2.1 +sp-hydra-veil-gui==2.2.9 +cryptography ~= 46.0.3 +dataclasses-json ~= 0.6.7 +marshmallow ~= 3.26.1 +psutil ~= 7.1.3 +python-dateutil ~= 2.9.0.post0 + + "annotated-types==0.7.0", + "certifi==2026.4.22", + "charset-normalizer==3.4.7", + "click==8.3.3", + "cytoolz==1.1.0", + "eth-hash==0.8.0", + "eth-typing==6.0.0", + "eth-utils==6.0.0", + "idna==3.13", + "packaging==26.2", + "pathspec==1.1.1", + "platformdirs==4.9.6", + "psutil==7.2.2", + "py-ecc==8.0.0", + "pydantic==2.13.3", + "pydantic_core==2.46.3", + "pydeps==3.0.6", + "pytokens==0.4.1", + "stdlib-list==0.12.0", + "toolz==1.1.0", + "typing-inspect==0.9.0", + "typing-inspection==0.4.2", + "typing_extensions==4.15.0", + "urllib3==2.6.3", + "annotated-types==0.7.0", + "certifi==2026.4.22", + "charset-normalizer==3.4.7", + "click==8.3.3", + "cytoolz==1.1.0", + "eth-hash==0.8.0", + "eth-typing==6.0.0", + "eth-utils==6.0.0", + "idna==3.13", + "packaging==26.2", + "pathspec==1.1.1", + "platformdirs==4.9.6", + "psutil==7.2.2", + "py-ecc==8.0.0", + "pydantic==2.13.3", + "pydantic_core==2.46.3", + "pydeps==3.0.6", + "pytokens==0.4.1", + "stdlib-list==0.12.0", + "toolz==1.1.0", + "typing-inspect==0.9.0", + "typing-inspection==0.4.2", + "typing_extensions==4.15.0", + "urllib3==2.6.3", diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..27f59f9 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,57 @@ +[project] +name = "sp-hydra-veil-core" +version = "2.3.3" +authors = [ + { name = "Simplified Privacy" }, +] +description = "A library that exposes core logic to higher-level components." +readme = "README.md" +requires-python = ">=3.12" +classifiers = [ + "Programming Language :: Python :: 3", + "Operating System :: POSIX :: Linux", +] +dependencies = [ + "cryptography ~= 46.0.3", + "dataclasses-json ~= 0.6.7", + "marshmallow ~= 3.26.1", + "pysocks ~= 1.7.1", + "python-dateutil ~= 2.9.0.post0", + "requests ~= 2.32.5", + "sp-essentials ~= 1.0.0", + "annotated-types==0.7.0", + "certifi==2026.4.22", + "charset-normalizer==3.4.7", + "click==8.3.3", + "cytoolz==1.1.0", + "eth-hash==0.8.0", + "eth-typing==6.0.0", + "eth-utils==6.0.0", + "idna==3.13", + "packaging==26.2", + "pathspec==1.1.1", + "platformdirs==4.9.6", + "psutil==7.2.2", + "py-ecc==8.0.0", + "pydantic==2.13.3", + "pydantic_core==2.46.3", + "pydeps==3.0.6", + "pytokens==0.4.1", + "stdlib-list==0.12.0", + "toolz==1.1.0", + "typing-inspect==0.9.0", + "typing-inspection==0.4.2", + "typing_extensions==4.15.0", + "urllib3==2.6.3", +] + +[project.urls] +Homepage = "https://git.simplifiedprivacy.com/codeking/sp-hydra-veil-core" +Issues = "https://git.simplifiedprivacy.com/codeking/sp-hydra-veil-core/issues" + +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[tool.hatch.build.targets.wheel] +packages = ["core"] diff --git a/requirements.txt b/requirements.txt index 6a07c9c..0baadc6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,34 @@ --index-url https://git.simplifiedprivacy.com/api/packages/codeking/pypi/simple/ sp-hydra-veil-cli==2.2.1 -sp-hydra-veil-gui==2.2.1 +sp-hydra-veil-gui==2.2.9 +cryptography ~= 46.0.3 +dataclasses-json ~= 0.6.7 +marshmallow ~= 3.26.1 +pysocks ~= 1.7.1 +python-dateutil ~= 2.9.0.post0 +requests ~= 2.32.5 +sp-essentials ~= 1.0.0 +annotated-types==0.7.0 +certifi==2026.4.22 +charset-normalizer==3.4.7 +click==8.3.3 +cytoolz==1.1.0 +eth-hash==0.8.0 +eth-typing==6.0.0 +eth-utils==6.0.0 +idna==3.13 +packaging==26.2 +pathspec==1.1.1 +platformdirs==4.9.6 +psutil==7.2.2 +py-ecc==8.0.0 +pydantic==2.13.3 +pydantic_core==2.46.3 +pydeps==3.0.6 +pytokens==0.4.1 +stdlib-list==0.12.0 +toolz==1.1.0 +typing-inspect==0.9.0 +typing-inspection==0.4.2 +typing_extensions==4.15.0 +urllib3==2.6.3 diff --git a/script_to_extract_dependencies.py b/script_to_extract_dependencies.py new file mode 100644 index 0000000..49c6f5a --- /dev/null +++ b/script_to_extract_dependencies.py @@ -0,0 +1,12 @@ +import tomllib +import json + +with open('pyproject.toml', 'rb') as f: + data = tomllib.load(f) + +deps = data.get('project', {}).get('dependencies', []) + +with open('requirements.txt', 'w') as f: + for dep in deps: + f.write(dep + '\n') +