fix(ci, build scripts): clean up dependencies, fixing paths #29 from Peter-L-SVK/stage

Author: Peter-L-SVK

README.md

@@ -113,6 +113,8 @@ recommendations. Extend with Python and Perl hooks for custom automation.
 # Install build dependencies
 sudo dnf install rpm-build rpmdevtools rpmlint python3-devel vte291-gtk4
 
+pip install polars
+
 # Clone and build
 git clone https://github.com/Peter-L-SVK/sql-schema-studio.git
 cd sql-schema-studio
@@ -133,10 +135,11 @@ sudo apt install -y python3-psycopg2 python3-gi python3-gi-cairo \
   python3-scikit-learn python3-matplotlib python3-cairo python3-paramiko \
   gir1.2-gtk-4.0 gir1.2-gtksource-5 libvte-2.91-gtk4-dev \
   python3-pipx
-  
-# Install dependencies with pipx
-pipx install faker kbcstorage scikit-learn
 
+pip install polars  --break-system-packages
+
+# Install dependencies with pipx
+pipx install faker kbcstorage scikit-learn --include-deps
 
 # Clone and build
 git clone https://github.com/Peter-L-SVK/sql-schema-studio.git
@@ -166,13 +169,15 @@ sudo apt install -y python3-psycopg2 python3-gi python3-gi-cairo \
   python3-sqlparse python3-keyring python3-numpy \
   python3-scikit-learn python3-matplotlib python3-cairo python3-paramiko \
   gir1.2-gtk-4.0 gir1.2-gtksource-5 libvte-2.91-gtk4-dev \
-  python3-pipx
+  pipx
+
+pip install polars  --break-system-packages
 
 # Install pipx if not already installed (it's in the apt command above)
 # pipx ensures isolated Python package installations
 
 # Install dependencies with pipx
-pipx install faker kbcstorage scikit-learn
+pipx install faker kbcstorage scikit-learn --include-deps
 
 # Clone and install from source
 git clone https://github.com/Peter-L-SVK/sql-schema-studio.git
@@ -186,7 +191,7 @@ python3 -m src.main
 
 ```bash
 sudo dnf install python3-gobject gtk4 gtksourceview5 libadwaita cairo python3-cairo \
-  python3-polars python3-paramiko python3-faker python3-kbcstorage vte291-gtk4
+  python3-paramiko python3-faker python3-kbcstorage vte291-gtk4
 
 git clone https://github.com/Peter-L-SVK/sql-schema-studio.git
 cd sql-schema-studio
@@ -209,13 +214,15 @@ sudo apt install -y python3-psycopg2 python3-gi python3-gi-cairo \
   python3-sqlparse python3-keyring python3-numpy \
   python3-matplotlib python3-cairo python3-paramiko \
   gir1.2-gtk-4.0 gir1.2-gtksource-5 libvte-2.91-gtk4-dev \
-  python3-pipx postgresql postgresql-client 
+  pipx postgresql postgresql-client 
+
+pip install polars  --break-system-packages
 
 # Install pipx if not already installed
 # pipx ensures isolated Python package installations
 
 # Install dependencies with pipx
-pipx install faker kbcstorage scikit-learn
+pipx install faker kbcstorage scikit-learn --include-deps
 
 # (Optional) Start local PostgreSQL
 sudo service postgresql start

scripts/packaging/build_deb.sh

@@ -16,12 +16,8 @@ mkdir -p ${BUILD_DIR}/${DEB_NAME}/usr/bin
 mkdir -p ${BUILD_DIR}/${DEB_NAME}/usr/lib/python3/dist-packages
 
 # Copy Python source files as package
-mkdir -p ${BUILD_DIR}/${DEB_NAME}/usr/lib/python3/dist-packages/sql_schema_studio
-cp -r src/* ${BUILD_DIR}/${DEB_NAME}/usr/lib/python3/dist-packages/sql_schema_studio/
-
-# Copy hooks
-mkdir -p ${BUILD_DIR}/${DEB_NAME}/usr/lib/python3/dist-packages/sql_schema_studio/hooks/python_hooks
-cp -r src/hooks/* ${BUILD_DIR}/${DEB_NAME}/usr/lib/python3/dist-packages/sql_schema_studio/hooks/ 2>/dev/null || true
+mkdir -p ${BUILD_DIR}/${DEB_NAME}/usr/lib/python3/dist-packages/src
+cp -r src/* ${BUILD_DIR}/${DEB_NAME}/usr/lib/python3/dist-packages/src/
 
 # Remove __pycache__ if any
 find ${BUILD_DIR}/${DEB_NAME} -name "__pycache__" -type d -exec rm -rf {} + 2>/dev/null || true
@@ -61,7 +57,7 @@ fi
 cat > ${BUILD_DIR}/${DEB_NAME}/usr/bin/sql-schema-studio << 'LAUNCHER'
 #!/bin/bash
 # SQL Schema Studio Launcher
-exec python3 -m sql_schema_studio.main "$@"
+exec python3 -m src.main "$@"
 LAUNCHER
 chmod +x ${BUILD_DIR}/${DEB_NAME}/usr/bin/sql-schema-studio
 
@@ -85,7 +81,7 @@ Depends: python3 (>= 3.12),
          gir1.2-gtk-4.0,
          gir1.2-gtksource-5,
          libvte-2.91-gtk4-dev       
-Recommends: python3-pipx
+Recommends: pipx
 Suggests: python3-faker, python3-kbcstorage
 Maintainer: Peter Leukanič <peter@leukanic.eu>
 Description: Intelligent PostgreSQL Management Platform
@@ -132,6 +128,7 @@ echo "✅ DEB built: ${DEB_NAME}.deb"
 echo "Install with: sudo dpkg -i ${DEB_NAME}.deb"
 echo "If dependencies fail, run: sudo apt --fix-broken install"
 echo ""
-echo "Optional dependencies (install after package):"
-echo "  pipx install faker kbcstorage"
+echo " Other dependencies (install after package):"
+echo "  pip install polars  --break-system-packages"
+echo "  pipx install faker kbcstorage scikit-learn --include-deps"
 echo "  sudo apt install python3-faker python3-kbcstorage"

scripts/packaging/build_rpm.sh

@@ -94,12 +94,10 @@ Requires:       python3-gobject
 Requires:       python3-sqlparse
 Requires:       python3-keyring
 Requires:       python3-numpy
-Requires:       python3-pandas
 Requires:       python3-scikit-learn
 Requires:       python3-matplotlib
 Requires:       python3-cairo
 Requires:       python3-paramiko
-Requires:       python3-kbcstorage
 Requires:       gtk4
 Requires:       gtksourceview5
 Requires:	vte291-gtk4
@@ -123,8 +121,8 @@ Features:
 
 %install
 # Create Python package directory - use absolute path
-mkdir -p %{buildroot}/usr/lib/python3/dist-packages/sql_schema_studio
-cp -r src/* %{buildroot}/usr/lib/python3/dist-packages/sql_schema_studio/
+mkdir -p %{buildroot}/usr/lib/python3/dist-packages/src
+cp -r src/* %{buildroot}/usr/lib/python3/dist-packages/src/
 
 # Remove __pycache__
 find %{buildroot} -name "__pycache__" -type d -exec rm -rf {} + 2>/dev/null || true
@@ -158,12 +156,12 @@ fi
 mkdir -p %{buildroot}/usr/bin
 cat > %{buildroot}/usr/bin/sql-schema-studio << 'LAUNCHER_EOF'
 #!/bin/bash
-exec python3 -m sql_schema_studio.main "$@"
+exec python3 -m src.main "$@"
 LAUNCHER_EOF
 chmod 755 %{buildroot}/usr/bin/sql-schema-studio
 
 %files
-/usr/lib/python3/dist-packages/sql_schema_studio/
+/usr/lib/python3/dist-packages/src/
 /usr/bin/sql-schema-studio
 /usr/share/icons/hicolor/scalable/apps/sql-schema-studio.svg
 /usr/share/applications/sql-schema-studio.desktop