Refactored required dependencies for qrcode.

[otp] Explicitly cast the output of otp.generate_secret to string.
Some versions of `pyotp` may return an intermediate `pyotp.random_base32` object that is not JSON-serializable.
2024-11-10 19:01:00 +01:00 · 2024-11-10 18:52:10 +01:00
8 changed files with 11 additions and 51 deletions
--- 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
--- 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
--- 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
--- 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
--- a/platypush/plugins/otp/init.py
+++ b/platypush/plugins/otp/init.py
@ -80,7 +80,7 @@ class OtpPlugin(Plugin):

        :return: The new secret token.
        """
-        return pyotp.random_base32()
+        return str(pyotp.random_base32())

    @action
    def refresh_secret(self, secret_path: Optional[str] = None) -> str:
--- 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"
  }
-}
+}
--- 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"
  }
-}
+}
--- 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
Author	SHA1	Message	Date
Fabio Manganiello	559063ed90	Refactored required dependencies for `qrcode`. Some checks failed continuous-integration/drone/push Build is failing Details	2024-11-10 19:01:00 +01:00
Fabio Manganiello	46321559ab	[otp] Explicitly cast the output of `otp.generate_secret` to string. Some versions of `pyotp` may return an intermediate `pyotp.random_base32` object that is not JSON-serializable.	2024-11-10 18:52:10 +01:00