version 0.9.2.6

- fixing pipx isolated installation
- updating docs

Author: s-n-g

Changelog

@@ -1,9 +1,12 @@
-2023-05-03 s-n-g
+2023-05-08 s-n-g
     * version 0.9.2.6
     * using pipx for installation on "externally-managed"
       python installations
+    * adding cache for pipx installation (and command line
+      parameters to handle it)
     * --list will indicate Group Headers
     * started working on scheduling
+    * updating docs
 
 2023-04-07 s-n-g
     * version 0.9.2.5

README.html

@@ -206,12 +206,15 @@ <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style=
 <h2 id="changelog">Changelog <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></span></h2>
 <pre style="height: 200px;">
 
-2023-05-03 s-n-g
+2023-05-08 s-n-g
     * version 0.9.2.6
     * using pipx for installation on "externally-managed"
       python installations
+    * adding cache for pipx installation (and command line
+      parameters to handle it)
     * --list will indicate Group Headers
     * started working on scheduling
+    * updating docs
 
 2023-04-07 s-n-g
     * version 0.9.2.5

devel/build_install_pyradio

@@ -205,6 +205,8 @@ function create_installation_type_file(){
         OLD=$(find ~/.local/lib -type d -name "pyradio*" 2>/dev/null | grep -v pipx | grep -v venvs)
         if [ ! -z "$OLD" ]
         then
+            if [ "$TO_PYTHON" = "2" ]
+            then
         echo
         echo
         echo "The following pyradio directories have been found:
@@ -213,6 +215,19 @@ $OLD
 They probably belong to an older non-pipx installation
 and they should be deleted.
 "
+        else
+            msg="
+
+The following [magenta]pyradio[/magenta] directories have been found:
+[red]$OLD[/red]
+
+They probably belong to an older non-pipx installation
+and they [red]should be deleted[/red].
+"
+            python${TO_PYTHON} -c \
+                'import sys; from rich import print; print(sys.argv[1])' \
+                "${msg}"
+        fi
         fi
     fi
 }
@@ -439,7 +454,7 @@ else
         inst_type=1
     else
         pipx install $PIPX_EDITABLE --force . || pipx_error
-        pipx runpip pyradio install -r requirements_pipx.txt
+        cat requirements_pipx.txt | sed -e 's/#.*//' | xargs pipx inject pyradio
         inst_type=2
     fi
 fi
@@ -503,7 +518,7 @@ then
     fi
     mkdir -p ~/.config/pyradio/data
     cp devel/pyradio.png ~/.config/pyradio/data
-    [ "$TO_PYTHON" == "2"  ] || create_installation_type_file
+    [ -z $PIPX  ] || create_installation_type_file
 else
     do_exit
     exit 1

linux-pipx.html

@@ -119,7 +119,7 @@ <h2 id="debian-and-derivatives">Debian and derivatives <span style="padding-left
 <p>Then install pipx:</p>
 <pre>sudo apt-get install pipx</pre>
 <p>If that fails, execute:</p>
-<pre>pyton3 -m pip install pipx</pre>
+<pre>python3 -m pip install pipx</pre>
 <p>Finally, execute:</p>
 <pre>python3 -m pipx ensurepath</pre>
 <p>and exit the terminal.</p>

linux-pipx.md

@@ -109,7 +109,7 @@ sudo apt-get install pipx
 If that fails, execute:
 
 ```
-pyton3 -m pip install pipx
+python3 -m pip install pipx
 ```
 
 Finally, execute:

pyradio/main.py

@@ -884,14 +884,14 @@ def shell():
         ''' curses is off '''
         if pyradio.setup_return_status:
             if pyradio_config.WIN_UNINSTALL and platform.startswith('win'):
-                # doing it this way so that pyton2 does not break (#153)
+                # doing it this way so that python2 does not break (#153)
                 from .win import win_press_any_key_to_unintall
                 win_press_any_key_to_unintall()
                 sys.exit()
 
             if pyradio_config.WIN_PRINT_PATHS and platform.startswith('win'):
                 ''' print exe path '''
-                # doing it this way so that pyton2 does not break (#153)
+                # doing it this way so that python2 does not break (#153)
                 from .win import win_print_exe_paths
                 print('')
                 win_print_exe_paths()

pyradio/win.py

@@ -62,7 +62,7 @@ def win_print_exe_paths():
             print('  [green]{}[/green]'.format(exe[0]))
         else:
             print('  [green]{}[/green]'.format(exe[1]))
-    # doing it this way so that pyton2 does not break (#153)
+    # doing it this way so that python2 does not break (#153)
     from .win import press_any_key_to_continue
     print('\nPress any key to exit...', end='', flush=True)
     getwch()