holado 0.2.1__tar.gz → 0.2.3__tar.gz

{holado-0.2.1 → holado-0.2.3}/.gitignore

@@ -6,3 +6,6 @@ __pycache__/
 .project
 .pydevproject
 .settings/
+
+# Packages
+packaging/dist/

{holado-0.2.1 → holado-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.2.1
+Version: 0.2.3
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues
@@ -25,16 +25,20 @@ Provides-Extra: db-postgresql
 Requires-Dist: psycopg; extra == 'db-postgresql'
 Provides-Extra: docker
 Requires-Dist: docker; extra == 'docker'
+Provides-Extra: grpc
+Requires-Dist: google; extra == 'grpc'
+Requires-Dist: google-api-core; extra == 'grpc'
+Requires-Dist: grpc-requests; extra == 'grpc'
+Requires-Dist: grpcio; extra == 'grpc'
+Requires-Dist: grpcio-reflection; extra == 'grpc'
+Requires-Dist: grpcio-tools; extra == 'grpc'
+Requires-Dist: protobuf; extra == 'grpc'
 Provides-Extra: helper-debug
 Requires-Dist: pympler; extra == 'helper-debug'
-Provides-Extra: protobuf-grpc
-Requires-Dist: google; extra == 'protobuf-grpc'
-Requires-Dist: google-api-core; extra == 'protobuf-grpc'
-Requires-Dist: grpc-requests; extra == 'protobuf-grpc'
-Requires-Dist: grpcio; extra == 'protobuf-grpc'
-Requires-Dist: grpcio-reflection; extra == 'protobuf-grpc'
-Requires-Dist: grpcio-tools; extra == 'protobuf-grpc'
-Requires-Dist: protobuf; extra == 'protobuf-grpc'
+Provides-Extra: protobuf
+Requires-Dist: google; extra == 'protobuf'
+Requires-Dist: google-api-core; extra == 'protobuf'
+Requires-Dist: protobuf; extra == 'protobuf'
 Provides-Extra: rabbitmq
 Requires-Dist: pika; extra == 'rabbitmq'
 Provides-Extra: redis

holado-0.2.3/packaging/VERSION

@@ -0,0 +1 @@
+0.2.3

{holado-0.2.1 → holado-0.2.3}/packaging/publish_distribution_archive.sh

@@ -8,7 +8,8 @@ if ! python -m pip install --upgrade twine; then
     exit 1;
 fi
 
-if ! python -m twine upload --repository testpypi packaging/dist/*; then
+VERSION=$(cat "${SCRIPT_DIR}/VERSION")
+if ! python -m twine upload --repository pypi ${SCRIPT_DIR}/dist/holado-${VERSION}*; then
     echo "ERROR: Failed to upload HolAdo distribution archives"
     exit 1;
 fi

holado-0.2.3/packaging/publish_distribution_archive_on_testpypi.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd ${SCRIPT_DIR}/..
+
+if ! python -m pip install --upgrade twine; then
+    echo "ERROR: Failed to update 'twine' package"
+    exit 1;
+fi
+
+VERSION=$(cat "${SCRIPT_DIR}/VERSION")
+if ! python -m twine upload --repository testpypi ${SCRIPT_DIR}/dist/holado-${VERSION}*; then
+    echo "ERROR: Failed to upload HolAdo distribution archives"
+    exit 1;
+fi

{holado-0.2.1 → holado-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "holado"
-version = "0.2.1"
+dynamic = ["version"]
 authors = [
   { name="Eric Klumpp", email="eric.klumpp@gmail.com" },
 ]
@@ -37,7 +37,8 @@ db = ["pypika"]
 db-postgresql = ["psycopg"]
 docker = ["docker"]
 helper_debug = ["pympler"]
-protobuf_grpc = ["google", "google-api-core", "grpc_requests", "protobuf", "grpcio", "grpcio-reflection", "grpcio-tools"]
+protobuf = ["google", "google-api-core", "protobuf"]
+grpc = ["holado[protobuf]", "grpc_requests", "grpcio", "grpcio-reflection", "grpcio-tools"]
 rabbitmq = ["pika"]
 redis = ["redis", "redis-om"]
 s3 = ["minio", "boto3", "moto", "flask", "flask_cors"]
@@ -48,4 +49,19 @@ yaml = ["pyyaml"]
 
 [project.urls]
 Homepage = "https://gitlab.com/holado_framework/python"
-Issues = "https://gitlab.com/holado_framework/python/-/issues"
+Issues = "https://gitlab.com/holado_framework/python/-/issues"
+
+[tool.hatch.version]
+path = "packaging/VERSION"
+pattern = "(?P<version>[\\w.]+)"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/holado", "src/holado_ais", "src/holado_binary", "src/holado_context", "src/holado_core", 
+    "src/holado_data", "src/holado_db", "src/holado_docker", "src/holado_grpc", "src/holado_helper", "src/holado_json", 
+    "src/holado_keycloak", "src/holado_logging", "src/holado_multitask", "src/holado_protobuf", "src/holado_python", 
+    "src/holado_rabbitmq", "src/holado_redis", "src/holado_report", "src/holado_rest", "src/holado_s3", 
+    "src/holado_scripting", "src/holado_sftp", "src/holado_swagger", "src/holado_system", "src/holado_test", 
+    "src/holado_value", "src/holado_ws", "src/holado_yaml",
+    "tests/behave/test_holado"]
+
+

holado-0.2.3/resources/scripts/script_tools.py

@@ -0,0 +1,15 @@
+import os
+import sys
+
+
+def insert_holado_helper():
+    # Insert path to holado_helper
+    holado_path = os.getenv('HOLADO_PATH')
+    if holado_path is None:
+        # If HolAdo sources are not cloned on this environment, use path within this installation
+        from holado import get_holado_path
+        holado_path = get_holado_path()
+        
+    sys.path.insert(0, os.path.join(holado_path, "src", "holado_helper", "script") )
+    
+

{holado-0.2.1 → holado-0.2.3}/src/holado/__init__.py

@@ -126,12 +126,16 @@ def initialize_session_context(session_kwargs=None):
         logger.debug("Initialized SessionContext")
     
     
-def holado_src_path():
+def get_holado_path():
+    here = os.path.abspath(os.path.dirname(__file__))
+    return os.path.normpath(os.path.join(here, "..", ".."))
+    
+def get_holado_src_path():
     here = os.path.abspath(os.path.dirname(__file__))
     return os.path.normpath(os.path.join(here, ".."))
     
 def get_holado_module_names():
-    lp = sorted(os.listdir(holado_src_path()))
+    lp = sorted(os.listdir(get_holado_src_path()))
     return [name for name in lp if name.startswith("holado_") and name not in ['holado_logging']]
 
 def import_modules(module_names):
@@ -211,7 +215,7 @@ def import_steps():
     from holado_core.common.exceptions.technical_exception import TechnicalException
     from holado_core.common.tools.tools import Tools
     
-    lp = sorted(os.listdir(holado_src_path()))
+    lp = sorted(os.listdir(get_holado_src_path()))
     for module_name in lp:
         if module_name.startswith("holado_"):
             if with_behave:
@@ -234,7 +238,7 @@ def import_steps():
 def import_private_steps():
     from holado_core.common.tools.tools import Tools
     
-    lp = sorted(os.listdir(holado_src_path()))
+    lp = sorted(os.listdir(get_holado_src_path()))
     for module_name in lp:
         if module_name.startswith("holado_"):
             if with_behave:

{holado-0.2.1 → holado-0.2.3}/src/holado_helper/docker/init_user.sh

@@ -19,6 +19,6 @@
 source /code/env/bin/activate
 
 # Set environment variables needed by HolAdo
-export TESTING_SOLUTION_PATH=/code/holado/python/
+export HOLADO_PATH=/code/holado/python/
 
 

{holado-0.2.1 → holado-0.2.3}/src/holado_helper/script/initialize_script.py

@@ -39,8 +39,9 @@ def _insert_sys_paths(additional_sys_paths=None):
     # Insert Holado paths
     holado_path = os.getenv('HOLADO_PATH')
     if holado_path is None:
-        here = os.path.abspath(os.path.dirname(__file__))
-        holado_path = os.path.abspath(os.path.join(here, "..", "..", ".."))
+        # If HolAdo sources are not cloned on this environment, use path within this installation
+        from holado import get_holado_path
+        holado_path = get_holado_path()
     __insert_sys_path(os.path.join(holado_path) )
     __insert_sys_path(os.path.join(holado_path, "src") )
     __insert_sys_path(os.path.join(holado_path, "tests", "behave") )

holado-0.2.3/tests/scripts/script_tools.py

@@ -0,0 +1,14 @@
+import os
+import sys
+
+
+def insert_holado_helper_script():
+    # Insert path to holado_helper
+    holado_path = os.getenv('HOLADO_PATH')
+    if holado_path is None:
+        # If HolAdo sources are not cloned on this environment, use path within this installation
+        from holado import get_holado_path
+        holado_path = get_holado_path()
+    sys.path.insert(0, os.path.join(holado_path, "src", "holado_helper", "script") )
+    
+

holado-0.2.1/resources/scripts/script_tools.py

@@ -1,15 +0,0 @@
-import os
-import sys
-
-
-def insert_holado_helper():
-    # Insert path to holado_helper
-    # holado_path = os.getenv('HOLADO_PATH')
-    # if holado_path is None:
-    #     raise Exception("Missing environment variable HOLADO_PATH with HolAdo installation path")
-    holado_path = os.getenv('TESTING_SOLUTION_PATH')
-    if holado_path is None:
-        raise Exception("Missing environment variable TESTING_SOLUTION_PATH with HolAdo installation path")
-    sys.path.insert(0, os.path.join(holado_path, "src", "holado_helper", "script") )
-    
-

holado-0.2.1/tests/scripts/script_tools.py

@@ -1,15 +0,0 @@
-import os
-import sys
-
-
-def insert_holado_helper():
-    # Insert path to holado_helper
-    # holado_path = os.getenv('HOLADO_PATH')
-    # if holado_path is None:
-    #     raise Exception("Missing environment variable HOLADO_PATH with HolAdo installation path")
-    holado_path = os.getenv('TESTING_SOLUTION_PATH')
-    if holado_path is None:
-        raise Exception("Missing environment variable TESTING_SOLUTION_PATH with HolAdo installation path")
-    sys.path.insert(0, os.path.join(holado_path, "src", "holado_helper", "script") )
-    
-