- updating build_install_pyradio so that it detects pipx even if it is

  not provided as a module (executable only)
- updating pyproject.toml
- renaming setup.py to seyup.py.legacy so that it does not interfere
  with the modern build chain but keeping a legacy way to build the
  package if needed

Author: s-n-g

MANIFEST.in

@@ -1,2 +1,7 @@
 recursive-include pyradio *
+prune pyradio/__pycache__
+prune pyradio/.ruff_cache
+prune devel
+prune .git
+prune .github
 exclude *.pyc *.orig

devel/build_install_pyradio

@@ -22,6 +22,48 @@ Checking python availability:"
             echo
 }
 
+function check_pipx() {
+    # Δοκιμή 1: python -m pipx
+    local pipx_test=$(python"${TO_PYTHON}" -m pipx --version 2>/dev/null)
+    if [ -n "$pipx_test" ]; then
+        echo "python${TO_PYTHON} -m pipx"
+        return 0
+    fi
+
+    # Δοκιμή 2: standalone pipx
+    pipx_test=$(pipx --version 2>/dev/null)
+    if [ -n "$pipx_test" ]; then
+        echo "pipx"
+        return 0
+    fi
+
+    # Δοκιμή 3: απόλυτο path (συνήθης θέση σε macOS)
+    pipx_test=$(/usr/local/bin/pipx --version 2>/dev/null)
+    if [ -n "$pipx_test" ]; then
+        echo "/usr/local/bin/pipx"
+        return 0
+    fi
+
+    # Δοκιμή 4: άλλα πιθανά paths
+    local potential_paths=(
+        "/opt/homebrew/bin/pipx"
+        "/usr/bin/pipx" 
+        "$HOME/.local/bin/pipx"
+    )
+    
+    for path in "${potential_paths[@]}"; do
+        if [ -x "$path" ]; then
+            pipx_test=$("$path" --version 2>/dev/null)
+            if [ -n "$pipx_test" ]; then
+                echo "$path"
+                return 0
+            fi
+        fi
+    done
+
+    return 1
+}
+
 function pipx_error(){
 cat <<END
 The installation has failed!!!
@@ -76,18 +118,21 @@ function uninstall(){
     echo 'Uninstalling PyRadio'
     echo -n '  ** Removing python files ... '
     echo -n "Looking for pipx ... "
-    PIPX_VERSION=$(python"${TO_PYTHON}" -m pipx --version)
-    [ -z "$PIPX_VERSION" ] || PIPX=1
-    [ -z "$PIPX_VERSION" ] && {
-        echo "Command used: python"${TO_PYTHON}" -m pipx --version 2>/dev/null"
-    } || echo "$PIPX_VERSION"
+    PIPX_CMD=$(check_pipx)
+    if [ -n "$PIPX_CMD" ]; then
+        PIPX=1
+        PIPX_VERSION=$($PIPX_CMD --version 2>/dev/null)
+        echo "$PIPX_VERSION (found via: $PIPX_CMD)"
+    else
+        echo "not found"
+    fi
     if [ -z "${PIPX}" ]
     then
         python -m pip uninstall -y pyradio 2>/dev/null 1>&2
         python2 -m pip uninstall -y pyradio 2>/dev/null 1>&2
         python3 -m pip uninstall -y pyradio 2>/dev/null 1>&2
     else
-        python"${TO_PYTHON}" -m pipx uninstall pyradio 2>/dev/null 1>&2
+        $PIPX_CMD uninstall pyradio 2>/dev/null 1>&2
     fi
     echo 'done'
     echo -n '  ** Removing help files ... '
@@ -345,27 +390,7 @@ do
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters
 
-# if [ -z "$NO_DEV" ]
-# then
-#     cd pyradio
-#     DEVEL=$(python -c 'from install import get_github_long_description_for_script; get_github_long_description_for_script()')
-#     # DEVEL=$(python -c 'from install import get_devel_version; print(get_devel_version())')
-#     echo "Devel version: $DEVEL"
-#     cd ..
-# fi
-
-
-## check dependencies :)
-#for prog in git sed ;do
-#    ${prog} --version 2>/dev/null 1>&2 || {
-#        echo "Error: ${prog} not found."
-#        echo "       Please install it and try again."
-#        exit 1
-#    }
-#done
-
 # check dependencies :)
-# for prog in git sed ;do
 for prog in sed ;do
     ${prog} --version 2>/dev/null 1>&2 || {
         if [ "${prog}" = "sed" ]
@@ -383,24 +408,19 @@ for prog in sed ;do
     }
 done
 
-# uninstall previous versions
-# uninstall 1
-
-# # delete any files that were left from previous attempt
-# sudo find . -iname "*.pyc" -delete 2>/dev/null
-# sudo find . -iname "*.egg" -delete 2>/dev/null
-
-# echo "***** installing for user..."
 do_dev
 
 #
 # Use pipx by default, if installed
 echo -n "Looking for pipx ... "
-PIPX_VERSION=$(python"${TO_PYTHON}" -m pipx --version)
-[ -z "$PIPX_VERSION" ] || PIPX=1
-[ -z "$PIPX_VERSION" ] && {
-    echo "Command used: python"${TO_PYTHON}" -m pipx --version 2>/dev/null"
-} || echo "$PIPX_VERSION"
+PIPX_CMD=$(check_pipx)
+if [ -n "$PIPX_CMD" ]; then
+    PIPX=1
+    PIPX_VERSION=$($PIPX_CMD --version 2>/dev/null)
+    echo "$PIPX_VERSION (found via: $PIPX_CMD)"
+else
+    echo "not found"
+fi
 
 if [ $(uname -s) = "Darwin" ] || [ $(uname -s) = "darwin" ]
 then
@@ -468,12 +488,12 @@ else
     fi
     if [ -z "$PIPX_ISOLATE" ]
     then
-        python3 -m pipx install $PIPX_EDITABLE --system-site-packages --force . || pipx_error
+        $PIPX_CMD install $PIPX_EDITABLE --system-site-packages --force . || pipx_error
         inst_type=1
     else
-        python3 -m pipx install $PIPX_EDITABLE --force . || pipx_error
+        $PIPX_CMD install $PIPX_EDITABLE --force . || pipx_error
         [ -z "$PIPX_EDITABLE" ] && \
-            cat requirements_pipx.txt | sed -e 's/#.*//' | xargs python3 -m pipx inject pyradio
+            cat requirements_pipx.txt | sed -e 's/#.*//' | xargs $PIPX_CMD inject pyradio
         inst_type=2
     fi
 fi

pyproject.toml

@@ -30,6 +30,21 @@ pyradio-client = "pyradio.main:run_client"
 "Homepage" = "https://github.com/coderholic/pyradio"
 "Bug Tracker" = "https://github.com/coderholic/pyradio/issues"
 
+[tool.setuptools.packages.find]
+include = [
+    "pyradio",
+    "pyradio.icons",
+    "pyradio.keyboard",
+    "pyradio.scripts",
+    "pyradio.themes"
+]
+exclude = [
+    "pyradio.__pycache__",
+    "pyradio.*.__pycache__",
+    "pyradio.*.tests",
+    "pyradio..ruff_cache"
+]
+
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = ["setuptools", "wheel"]  # PEP 508 specifications.

setup.py

@@ -0,0 +1 @@
+setup.py.legacy

setup.py

@@ -0,0 +1,67 @@
+#!/usr/bin/env python
+#
+# This file is kept ONLY for legacy build systems which do not support PEP 517/518.
+# The official and supported way to build pyradio is via `pyproject.toml`:
+#
+#     pip install .
+#     python -m build
+#
+# If you *really* need to use the old build system, rename this file back to
+# `setup.py` and run:
+#
+#     python setup.py install
+#
+# NOTE: This will be removed in the future.
+#
+from os import path as op
+from setuptools import setup, find_namespace_packages
+
+from pyradio import version, __project__, __license__
+
+
+def read(filename):
+    ret = ''
+    if op.exists(filename):
+        with open(op.join(op.dirname(__file__), filename), encoding='utf-8') as f:
+            ret = f.read()
+    return ret
+
+
+meta = dict(
+    name=__project__,
+    version=version,
+    license=__license__,
+    description=read('DESCRIPTION').rstrip(),
+    platforms=('Any'),
+    author='Ben Dowling',
+    author_email='[email protected]',
+    url='http://github.com/coderholic/pyradio',
+    include_package_data=True,
+    packages=find_namespace_packages(
+        include=[
+            'pyradio',
+            'pyradio.icons',
+            'pyradio.keyboard',
+            'pyradio.scripts',
+            'pyradio.themes'
+        ],
+        exclude=[
+            'pyradio.__pycache__',
+            'pyradio.*.__pycache__',
+            'pyradio..ruff_cache',
+            'devel',
+            'favicon'
+        ]
+    ),
+    entry_points={
+        'console_scripts': [
+            'pyradio = pyradio.main:shell',
+            'pyradio-client = pyradio.main:run_client'
+        ]
+    },
+    install_requires=[],
+)
+
+
+if __name__ == "__main__":
+    setup(**meta)