From 45f9204c6ceedfd55730ab581de19c92099ccbc2 Mon Sep 17 00:00:00 2001
From: MOIS3Y <s.zhukovskii@ispsystem.com>
Date: Fri, 31 May 2024 13:51:15 +0900
Subject: [PATCH] Refactoring: remove core pkg, all subpkgs now in root pkg
---
isp_maintenance/{core => api}/__init__.py | 0
isp_maintenance/{core => }/api/base.py | 0
isp_maintenance/{core => }/api/dci6.py | 2 +-
isp_maintenance/{core => }/api/vm6.py | 2 +-
isp_maintenance/apps/dci6/commands.py | 2 +-
isp_maintenance/apps/vm6/commands.py | 2 +-
isp_maintenance/{core/api => cli}/__init__.py | 0
isp_maintenance/{core => }/cli/lazy_group.py | 0
isp_maintenance/core/cli/__init__.py | 0
isp_maintenance/ispmgr.py | 2 +-
10 files changed, 5 insertions(+), 5 deletions(-)
rename isp_maintenance/{core => api}/__init__.py (100%)
rename isp_maintenance/{core => }/api/base.py (100%)
rename isp_maintenance/{core => }/api/dci6.py (94%)
rename isp_maintenance/{core => }/api/vm6.py (78%)
rename isp_maintenance/{core/api => cli}/__init__.py (100%)
rename isp_maintenance/{core => }/cli/lazy_group.py (100%)
delete mode 100644 isp_maintenance/core/cli/__init__.py
diff --git a/isp_maintenance/core/__init__.py b/isp_maintenance/api/__init__.py
similarity index 100%
rename from isp_maintenance/core/__init__.py
rename to isp_maintenance/api/__init__.py
diff --git a/isp_maintenance/core/api/base.py b/isp_maintenance/api/base.py
similarity index 100%
rename from isp_maintenance/core/api/base.py
rename to isp_maintenance/api/base.py
diff --git a/isp_maintenance/core/api/dci6.py b/isp_maintenance/api/dci6.py
similarity index 94%
rename from isp_maintenance/core/api/dci6.py
rename to isp_maintenance/api/dci6.py
index 3bc33d5..80aebe2 100644
--- a/isp_maintenance/core/api/dci6.py
+++ b/isp_maintenance/api/dci6.py
@@ -1,4 +1,4 @@
-from core.api.base import BaseAPI, BaseAuthAPI, BaseDnsProxyAPI, BaseIpAPI
+from api.base import BaseAPI, BaseAuthAPI, BaseDnsProxyAPI, BaseIpAPI
class AuthAPI(BaseAuthAPI):
diff --git a/isp_maintenance/core/api/vm6.py b/isp_maintenance/api/vm6.py
similarity index 78%
rename from isp_maintenance/core/api/vm6.py
rename to isp_maintenance/api/vm6.py
index dbaa923..fc9eaed 100644
--- a/isp_maintenance/core/api/vm6.py
+++ b/isp_maintenance/api/vm6.py
@@ -1,4 +1,4 @@
-from core.api.base import BaseAPI, BaseAuthAPI, BaseDnsProxyAPI, BaseIpAPI
+from api.base import BaseAPI, BaseAuthAPI, BaseDnsProxyAPI, BaseIpAPI
class AuthAPI(BaseAuthAPI):
diff --git a/isp_maintenance/apps/dci6/commands.py b/isp_maintenance/apps/dci6/commands.py
index 33964af..e864586 100644
--- a/isp_maintenance/apps/dci6/commands.py
+++ b/isp_maintenance/apps/dci6/commands.py
@@ -1,6 +1,6 @@
import click
-from core.cli.lazy_group import LazyGroup
+from cli.lazy_group import LazyGroup
from settings.general import INSTALLED_APPS
diff --git a/isp_maintenance/apps/vm6/commands.py b/isp_maintenance/apps/vm6/commands.py
index cc17cd8..ad96145 100644
--- a/isp_maintenance/apps/vm6/commands.py
+++ b/isp_maintenance/apps/vm6/commands.py
@@ -1,5 +1,5 @@
import click
-from core.cli.lazy_group import LazyGroup
+from cli.lazy_group import LazyGroup
from settings.general import INSTALLED_APPS
diff --git a/isp_maintenance/core/api/__init__.py b/isp_maintenance/cli/__init__.py
similarity index 100%
rename from isp_maintenance/core/api/__init__.py
rename to isp_maintenance/cli/__init__.py
diff --git a/isp_maintenance/core/cli/lazy_group.py b/isp_maintenance/cli/lazy_group.py
similarity index 100%
rename from isp_maintenance/core/cli/lazy_group.py
rename to isp_maintenance/cli/lazy_group.py
diff --git a/isp_maintenance/core/cli/__init__.py b/isp_maintenance/core/cli/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/isp_maintenance/ispmgr.py b/isp_maintenance/ispmgr.py
index 53e99af..380a1de 100755
--- a/isp_maintenance/ispmgr.py
+++ b/isp_maintenance/ispmgr.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
import click
-from core.cli.lazy_group import LazyGroup
+from cli.lazy_group import LazyGroup
@click.group(