From 9484150903de20c056514566dbd6d4d39d564c81 Mon Sep 17 00:00:00 2001
From: ronny abraham <ronny.abraham@ymail.com>
Date: Fri, 7 Jul 2023 16:38:52 +0300
Subject: [PATCH] made database and deploy import relative

---
 modules/database.py | 28 ++++++++++++++---
 modules/deploy.py   | 77 +++++++++++++++++++++++++++++++--------------
 2 files changed, 77 insertions(+), 28 deletions(-)

diff --git a/modules/database.py b/modules/database.py
index 4f17a1e..e284cb3 100644
--- a/modules/database.py
+++ b/modules/database.py
@@ -1,12 +1,30 @@
 from fabric.api import env, task
-# # from jinja2 import Environment
-import os
-from .utils import upload_template as utils_upload_template
-from .utils import loggify, print_console, booleanize
-# from utils import prompt_continue
+
 from getpass import getpass
 import fabric.operations as fabric_ops
 
+import os
+import sys
+import pathlib
+
+dir_parent = pathlib.Path(os.path.abspath(__file__)).parents[2]
+sys.path.append(str(dir_parent))
+
+try:
+    from customfabric.modules.utils import upload_template \
+        as utils_upload_template
+
+    from customfabric.modules.utils import loggify, print_console, booleanize
+
+except ImportError:
+    raise
+
+# import os
+# from .utils import upload_template as utils_upload_template
+# from .utils import loggify, print_console, booleanize
+# from getpass import getpass
+# import fabric.operations as fabric_ops
+
 
 NOTE = """
     \n\n\n
diff --git a/modules/deploy.py b/modules/deploy.py
index db00a82..ee92dbf 100644
--- a/modules/deploy.py
+++ b/modules/deploy.py
@@ -2,32 +2,63 @@ from fabric.api import env, task
 from fabric.operations import run
 from fabric.operations import local
 
-# from fabric.contrib.files import upload_template
-# from utils import print_run
-
-from .utils import virtualenv_source, booleanize, loggify
-from .utils import print_console
-from .utils import link_create
-
-from .nginx import upload as upload_nginx
-from .nginx import remove as nginx_remove
-from .supervisor import upload as upload_supervisor
-from .supervisor import remove as supervisor_remove
-
-
-from .pip import setup_virtualenv
-from .pip import bootstrap_pip
-from .pip import install as pip_install
-
-from .django import create_project
-from .django import generate as django_generate
-from .django import collectstatic as django_collectstatic
-
-from . import initialize
-
 import os
+import sys
+import pathlib
 import logging
 
+dir_parent = pathlib.Path(os.path.abspath(__file__)).parents[2]
+sys.path.append(str(dir_parent))
+
+try:
+    from customfabric.modules.utils import virtualenv_source, booleanize
+    from customfabric.modules.utils import loggify
+    from customfabric.modules.utils import print_console
+    from customfabric.modules.utils import link_create
+
+    from customfabric.modules.nginx import upload as upload_nginx
+    from customfabric.modules.nginx import remove as nginx_remove
+    from customfabric.modules.supervisor import upload as upload_supervisor
+    from customfabric.modules.supervisor import remove as supervisor_remove
+
+    from customfabric.modules.pip import setup_virtualenv
+    from customfabric.modules.pip import bootstrap_pip
+    from customfabric.modules.pip import install as pip_install
+
+    from customfabric.modules.django import create_project
+    from customfabric.modules.django import generate as django_generate
+
+    from customfabric.modules.django import collectstatic \
+        as django_collectstatic
+
+    import customfabric.modules.initialize as initialize
+
+except ImportError:
+    raise
+
+# from .utils import virtualenv_source, booleanize, loggify
+# from .utils import print_console
+# from .utils import link_create
+#
+# from .nginx import upload as upload_nginx
+# from .nginx import remove as nginx_remove
+# from .supervisor import upload as upload_supervisor
+# from .supervisor import remove as supervisor_remove
+#
+#
+# from .pip import setup_virtualenv
+# from .pip import bootstrap_pip
+# from .pip import install as pip_install
+#
+# from .django import create_project
+# from .django import generate as django_generate
+# from .django import collectstatic as django_collectstatic
+#
+# from . import initialize
+#
+# import os
+# import logging
+
 # NOTE:
 #   we have a bunch of imports scattered through the func definitions
 #   this is done b/c otherwise fabric will consider the modules we are