From bd1aa13f1057265d1c117577e32c021bb858fd0e Mon Sep 17 00:00:00 2001 From: deepakdinesh1123 Date: Tue, 27 Feb 2024 12:00:17 +0530 Subject: [PATCH 1/3] packages.json renamed to manifest.json --- backend/src/zelthy/apps/dynamic_models/workspace/base.py | 2 +- backend/src/zelthy/cli/package_info.py | 2 +- backend/src/zelthy/core/package_utils.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/zelthy/apps/dynamic_models/workspace/base.py b/backend/src/zelthy/apps/dynamic_models/workspace/base.py index 5d591a06e..2be3e9744 100644 --- a/backend/src/zelthy/apps/dynamic_models/workspace/base.py +++ b/backend/src/zelthy/apps/dynamic_models/workspace/base.py @@ -190,7 +190,7 @@ def get_packages(self) -> list[dict]: """ returns list of packages """ - with open(self.path + "packages.json") as f: + with open(self.path + "manifest.json") as f: return json.loads(f.read())["packages"] def get_package_path(self, package_name: str) -> str: diff --git a/backend/src/zelthy/cli/package_info.py b/backend/src/zelthy/cli/package_info.py index ff354258e..b64e56f87 100644 --- a/backend/src/zelthy/cli/package_info.py +++ b/backend/src/zelthy/cli/package_info.py @@ -19,7 +19,7 @@ def list_packages(tenant): tenants.append(tenant) for tenant in os.listdir("workspaces"): click.echo(f"List of Packages in Tenant {tenant}") - with open(f"workspaces/{tenant}/packages.json", "r") as f: + with open(f"workspaces/{tenant}/manifest.json", "r") as f: data = json.loads(f.read()) packages = data["packages"] for package in packages: diff --git a/backend/src/zelthy/core/package_utils.py b/backend/src/zelthy/core/package_utils.py index 247a42431..10e5a0b29 100644 --- a/backend/src/zelthy/core/package_utils.py +++ b/backend/src/zelthy/core/package_utils.py @@ -17,7 +17,7 @@ def create_directories(dirs): def get_installed_packages(tenant): - with open(f"workspaces/{tenant}/packages.json", "r") as f: + with open(f"workspaces/{tenant}/manifest.json", "r") as f: data = json.loads(f.read()) packages = data["packages"] return {package["name"]: package["version"] for package in packages} @@ -78,12 +78,12 @@ def update_settings_json(tenant, package_name, version): def update_packages_json(tenant, package_name, version): - with open(f"workspaces/{tenant}/packages.json", "r") as f: + with open(f"workspaces/{tenant}/manifest.json", "r") as f: data = json.loads(f.read()) data["packages"].append({"name": package_name, "version": version}) - with open(f"workspaces/{tenant}/packages.json", "w") as file: + with open(f"workspaces/{tenant}/manifest.json", "w") as file: json.dump(data, file, indent=4) From 362d7b6abe88280d8e83397fc8a1dee27a44d1b2 Mon Sep 17 00:00:00 2001 From: deepakdinesh1123 Date: Fri, 1 Mar 2024 00:24:56 +0530 Subject: [PATCH 2/3] packages.json in workspace folder renamed to manifest.json --- .../{{cookiecutter.app_name}}/{packages.json => manifest.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename backend/src/zelthy/apps/shared/tenancy/workspace_folder_template/{{cookiecutter.app_name}}/{packages.json => manifest.json} (100%) diff --git a/backend/src/zelthy/apps/shared/tenancy/workspace_folder_template/{{cookiecutter.app_name}}/packages.json b/backend/src/zelthy/apps/shared/tenancy/workspace_folder_template/{{cookiecutter.app_name}}/manifest.json similarity index 100% rename from backend/src/zelthy/apps/shared/tenancy/workspace_folder_template/{{cookiecutter.app_name}}/packages.json rename to backend/src/zelthy/apps/shared/tenancy/workspace_folder_template/{{cookiecutter.app_name}}/manifest.json From 82a863031d4f1f4f2ef914f4c4fbafd323d48be0 Mon Sep 17 00:00:00 2001 From: deepakdinesh1123 Date: Fri, 1 Mar 2024 00:32:24 +0530 Subject: [PATCH 3/3] update_packages_json method renamed to update_manifest_json --- backend/src/zelthy/core/package_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/zelthy/core/package_utils.py b/backend/src/zelthy/core/package_utils.py index 10e5a0b29..d41fc2731 100644 --- a/backend/src/zelthy/core/package_utils.py +++ b/backend/src/zelthy/core/package_utils.py @@ -77,7 +77,7 @@ def update_settings_json(tenant, package_name, version): json.dump(data, file, indent=4) -def update_packages_json(tenant, package_name, version): +def update_manifest_json(tenant, package_name, version): with open(f"workspaces/{tenant}/manifest.json", "r") as f: data = json.loads(f.read()) @@ -155,7 +155,7 @@ def install_package(package_name, version, tenant): # f"tmp/{package_name}/{version}/", # f"workspaces/{tenant}/packages/{package_name}", # ) - update_packages_json(tenant, package_name, version) + update_manifest_json(tenant, package_name, version) update_settings_json(tenant, package_name, version) subprocess.run(f"python manage.py sync_static {tenant}", shell=True)