prepare for merge

Author: hamdy-simplyblock

.github/workflows/e2e-docker-server-111.yml

@@ -15,7 +15,7 @@ on:
       sbcli_cmd:
         description: 'Command for sbcli execution'
         required: true
-        default: 'sbcli-down'
+        default: 'sbcli-dev'
       ndcs:
         description: 'Value for NDCS'
         required: false

setup.py

@@ -2,8 +2,7 @@
 
 from setuptools import setup, find_packages
 
-from setuptools.command.install import install
-from setuptools.command.build import build
+from setuptools.command.install import install as _install
 
 
 def _post_install():
@@ -20,26 +19,12 @@ def _post_install():
             _, out = getstatusoutput(f'source {path}')
 
 
-class CustomInstallCommand(install):
+class install(_install):
     def run(self):
+        _install.run(self)
         self.execute(_post_install, (), msg="Running post install task")
-        print("**"*50)
-        _post_install()
-        install.run(self)
 
-class CustomBuildCommand(build):
-    def run(self):
-        self.execute(_post_install, (), msg="Running post install task")
-        print("**"*50)
-        _post_install()
-        build.run(self)
-
-#
-# class CustomInstallCommand(install):
-#     """Customized setuptools install command - prints a friendly greeting."""
-#     def run(self):
-#         print "Hello, developer, how are you? :)"
-#         install.run(self)
+
 def get_env_var(name, default=None):
     if not name:
         return False
@@ -110,8 +95,5 @@ def get_requirements():
         '': ["/etc/simplyblock/requirements.txt"],
         '/etc/simplyblock': ["requirements.txt"]
     },
-    cmdclass={
-        # 'install': CustomInstallCommand,
-        'build': CustomBuildCommand
-    },
+    cmdclass={'install': install},
 )

simplyblock_core/env_var

@@ -1,5 +1,5 @@
-SIMPLY_BLOCK_COMMAND_NAME=sbcli-down
-SIMPLY_BLOCK_VERSION=0.5.0
+SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
+SIMPLY_BLOCK_VERSION=13.0.19
 
-SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:down
+SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
 DOCKER_USER=hamdysimplyblock