From 559063ed90fb470abb42bdb526987d2ea95473d1 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Sun, 10 Nov 2024 19:01:00 +0100 Subject: [PATCH] Refactored required dependencies for `qrcode`. --- platypush/install/requirements/alpine.txt | 1 + platypush/install/requirements/arch.txt | 1 + platypush/install/requirements/debian.txt | 1 + platypush/install/requirements/fedora.txt | 1 + platypush/plugins/otp/manifest.json | 20 ++----------- platypush/plugins/qrcode/manifest.json | 34 ++--------------------- requirements.txt | 2 ++ 7 files changed, 10 insertions(+), 50 deletions(-) diff --git a/platypush/install/requirements/alpine.txt b/platypush/install/requirements/alpine.txt index cbebba7673..4c7fcaeca5 100644 --- a/platypush/install/requirements/alpine.txt +++ b/platypush/install/requirements/alpine.txt @@ -11,6 +11,7 @@ py3-mypy-extensions py3-otp py3-psutil py3-pygments +py3-pyzbar py3-qrcode py3-redis py3-requests diff --git a/platypush/install/requirements/arch.txt b/platypush/install/requirements/arch.txt index dc023552ec..955a4ce094 100644 --- a/platypush/install/requirements/arch.txt +++ b/platypush/install/requirements/arch.txt @@ -10,6 +10,7 @@ python-pip python-psutil python-pygments python-pyotp +python-pyzbar python-qrcode python-redis python-requests diff --git a/platypush/install/requirements/debian.txt b/platypush/install/requirements/debian.txt index 6b32928c58..51c046ace1 100644 --- a/platypush/install/requirements/debian.txt +++ b/platypush/install/requirements/debian.txt @@ -12,6 +12,7 @@ python3-mypy-extensions python3-psutil python3-pygments python3-pyotp +python3-pyzbar python3-qrcode python3-redis python3-requests diff --git a/platypush/install/requirements/fedora.txt b/platypush/install/requirements/fedora.txt index 1c103ef213..b8eb002f30 100644 --- a/platypush/install/requirements/fedora.txt +++ b/platypush/install/requirements/fedora.txt @@ -12,6 +12,7 @@ python-mypy_extensions python-psutil python-pygments python-pyotp +python-pyzbar python-qrcode python-redis python-requests diff --git a/platypush/plugins/otp/manifest.json b/platypush/plugins/otp/manifest.json index 3f372a64ac..ef0a6ad7af 100644 --- a/platypush/plugins/otp/manifest.json +++ b/platypush/plugins/otp/manifest.json @@ -1,24 +1,8 @@ { "manifest": { "events": {}, - "install": { - "apk": [ - "py3-otp" - ], - "apt": [ - "python3-pyotp" - ], - "dnf": [ - "python-pyotp" - ], - "pacman": [ - "python-pyotp" - ], - "pip": [ - "pyotp" - ] - }, + "install": {}, "package": "platypush.plugins.otp", "type": "plugin" } -} \ No newline at end of file +} diff --git a/platypush/plugins/qrcode/manifest.json b/platypush/plugins/qrcode/manifest.json index 55b65d6901..a5e414f2b8 100644 --- a/platypush/plugins/qrcode/manifest.json +++ b/platypush/plugins/qrcode/manifest.json @@ -3,38 +3,8 @@ "events": [ "platypush.message.event.qrcode.QrcodeScannedEvent" ], - "install": { - "apk": [ - "py3-numpy", - "py3-pillow", - "py3-qrcode", - "py3-pyzbar" - ], - "apt": [ - "python3-numpy", - "python3-pillow", - "python3-pyzbar", - "python3-qrcode" - ], - "dnf": [ - "python-numpy", - "python-pillow", - "python-qrcode", - "python-zbar" - ], - "pacman": [ - "python-numpy", - "python-pillow", - "python-qrcode" - ], - "pip": [ - "numpy", - "qrcode", - "pyzbar", - "Pillow" - ] - }, + "install": {}, "package": "platypush.plugins.qrcode", "type": "plugin" } -} \ No newline at end of file +} diff --git a/requirements.txt b/requirements.txt index fcabb51645..1bc0376188 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,11 +7,13 @@ croniter docutils flask marshmallow +Pillow python-dateutil python-magic pygments pyotp pyyaml +pyzbar qrcode redis requests