Better project and target structure; bump version: 0.1.7

Author: manuelkiessling

bin/ppmc

@@ -45,10 +45,37 @@ done
 SCRIPT_DIR=$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )
 echo "Script directory: $SCRIPT_DIR"
 
-# Check if the package is installed
-if python -c "import platform_problem_monitoring_core" &>/dev/null; then
+# Try to determine which Python executable to use
+PYTHON_CMD="python3"
+
+# Check if Python 3 is available
+if ! command -v python3 &>/dev/null; then
+    # Fall back to just 'python' if python3 is not available
+    if command -v python &>/dev/null; then
+        PYTHON_CMD="python"
+    else
+        echo "Error: Neither python3 nor python found in PATH"
+        exit 1
+    fi
+fi
+
+echo "Using Python: $($PYTHON_CMD --version)"
+
+# More robust check for installed package
+PACKAGE_INSTALLED=false
+if $PYTHON_CMD -c "import platform_problem_monitoring_core" &>/dev/null; then
+    echo "Package found in primary Python installation"
+    PACKAGE_INSTALLED=true
+# Try with pip list as a fallback check
+elif $PYTHON_CMD -m pip list | grep -i "platform-problem-monitoring-core" &>/dev/null; then
+    echo "Package found in pip list"
+    PACKAGE_INSTALLED=true
+fi
+
+# Determine if we're running from source or an installed package
+if [ "$PACKAGE_INSTALLED" = true ]; then
     echo "Running from installed package"
-    PYTHON_CMD="python"
+    PYTHON_CMD=$PYTHON_CMD
 else
     # If running from source, detect package root and create/use virtual environment
     # When running from source, the script should be in bin/ which is at the root of the project
@@ -62,7 +89,7 @@ else
 
         if [ ! -d "venv" ]; then
             echo "Creating virtual environment"
-            python3 -m venv venv
+            $PYTHON_CMD -m venv venv
         fi
 
         source venv/bin/activate

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "platform_problem_monitoring_core"
-version = "0.1.6"
+version = "0.1.8"
 description = "A tool for monitoring platform problems using Elasticsearch logs"
 authors = [
     {name = "Platform Team"}