From ba3182631e57f51432294ddd791b9bedef37c5c8 Mon Sep 17 00:00:00 2001 From: Believethehype Date: Mon, 18 Dec 2023 10:03:45 +0100 Subject: [PATCH] some adjustments in terms of installation package --- nostr_dvm/interfaces/dvmtaskinterface.py | 4 +++- nostr_dvm/tasks/convert_media.py | 2 +- setup.py | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nostr_dvm/interfaces/dvmtaskinterface.py b/nostr_dvm/interfaces/dvmtaskinterface.py index 1d0d08d..3035ef4 100644 --- a/nostr_dvm/interfaces/dvmtaskinterface.py +++ b/nostr_dvm/interfaces/dvmtaskinterface.py @@ -59,13 +59,15 @@ class DVMTaskInterface: def install_dependencies(self, dvm_config): if dvm_config.SCRIPT != "": if self.dvm_config.USE_OWN_VENV: + dir = r'cache/venvs/' + os.path.basename(dvm_config.SCRIPT).split(".py")[0] if not os.path.isdir(dir): print(dir) create(dir, with_pip=True, upgrade_deps=True) + self.dependencies.append(("nostr-dvm", "nostr-dvm")) for (module, package) in self.dependencies: print("Installing Venv Module: " + module) - run(["bin/pip", "install", package], cwd=dir) + run(["bin/pip", "install", "--force-reinstall", package], cwd=dir) else: for module, package in self.dependencies: if module != "nostr-dvm": diff --git a/nostr_dvm/tasks/convert_media.py b/nostr_dvm/tasks/convert_media.py index 0de9ba6..2d30475 100644 --- a/nostr_dvm/tasks/convert_media.py +++ b/nostr_dvm/tasks/convert_media.py @@ -89,7 +89,7 @@ def build_example(name, identifier, admin_config): "encryptionSupported": True, "cashuAccepted": True, "nip90Params": { - "media_format": { + "format": { "required": False, "values": ["video/mp4", "audio/mp3"] } diff --git a/setup.py b/setup.py index a96c4d8..7a0e5eb 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -VERSION = '0.0.5' +VERSION = '0.0.6' DESCRIPTION = 'A framework to build and run Nostr NIP90 Data Vending Machines' LONG_DESCRIPTION = ('A framework to build and run Nostr NIP90 Data Vending Machines. ' 'This is an early stage release. Interfaces might change/brick') @@ -13,7 +13,8 @@ setup( author_email="believethehypeonnostr@proton.me", description=DESCRIPTION, long_description=LONG_DESCRIPTION, - packages=find_packages(include=['nostr_dvm', 'nostr_dvm.backends', 'nostr_dvm.interfaces', 'nostr_dvm.tasks', 'nostr_dvm.utils']), + packages=find_packages(include=['nostr_dvm', 'nostr_dvm.backends', 'nostr_dvm.interfaces', 'nostr_dvm.tasks', + 'nostr_dvm.utils', 'nostr_dvm.utils.scrapper']), install_requires=["nostr-sdk==0.0.5", "bech32==1.2.0", "pycryptodome==3.19.0",