- version 0.9.2.25

- droping python 2 - PyRadio will only run on python 3 - fixing #228
coderholic · Feb 24, 2024 · da5b99c · da5b99c
1 parent 0fb95a8
commit da5b99c
Show file tree

Hide file tree

Showing 17 changed files with 119 additions and 295 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,8 @@
+2024-02-24 s-n-g
+    * version 0.9.2.25
+    * droping python 2 - PyRadio will only run on python 3
+    * fixing #228
+
 2024-01-12 s-n-g
     * version 0.9.2.24 (BUG FIX)
     * fixing mpv title parsing (once again)

diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ If you face this situation, please refer to [this page](docs/pip-error.md) to re
 and much more...
 
 ## Requirements
-* python 2.7/3.5+
+* python 3.7+
     - setuptools
     - wheel
     - requests

diff --git a/devel/build_install_pyradio b/devel/build_install_pyradio
@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 function help(){
-echo "Usage: $0 [2/-R]"
+echo "Usage: $0 [-R/-t]"
 echo "
 Available options:
-     2   build using python v. 2.7 (linux only)
     -R   remove (uninstall) pyradio
     -t   Use this terminal for Desktop file (linux only)
 
@@ -44,10 +43,8 @@ exit 1
 function find_paths(){
 local APATH
 python devel/site.py 2>/dev/null
-python2 devel/site.py 2>/dev/null
 python3 devel/site.py 2>/dev/null
 APATH=$(python -m site --user-site 2>/dev/null) && echo "$APATH"
-APATH=$(python2 -m site --user-site 2>/dev/null) && echo "$APATH"
 APATH=$(python3 -m site --user-site 2>/dev/null) && echo "$APATH"
 }
 
@@ -249,6 +246,7 @@ function check_root(){
 check_root
 rm -rf build pyradio.egg-info 2>/dev/null
 TO_PYTHON=3
+[[ $(python --version 2>/dev/null) == *" 3."* ]] && TO_PYTHON=''
 TO_PYTHON_FROM_X=''
 NO_DEV=''
 while [[ $# -gt 0 ]]
@@ -289,15 +287,11 @@ do
             exit
             ;;
         2)
-            [ -z "${TO_PYTHON_FROM_X}" ] && TO_PYTHON=2
-            if [ $(uname -s) = "Darwin" ] || [ $(uname -s) = "darwin" ]
-            then
-                echo
-                echo
-                echo "Error: PyRadio does not support python 2 any more."
-                echo "Please install python 3 and try again."
-                exit 1
-            fi
+            echo
+            echo
+            echo "Error: PyRadio does not support python 2 any more."
+            echo "Please install python 3 and try again."
+            exit 1
             shift
             ;;
         -x)

diff --git a/docs/build.html b/docs/build.html
@@ -50,7 +50,6 @@ <h2 id="table-of-contents">Table of Contents <span style="padding-left: 10px;"><
 <ul>
 <li><a href="#more-info">More info</a></li>
 </ul></li>
-<li><a href="#notice-for-python-2-users">Notice for Python 2 users</a></li>
 <li><a href="#installation-on-the-bsds">Installation on the BSDs</a></li>
 <li><a href="#rasberry-pi-installation">Rasberry Pi installation</a></li>
 </ul></li>
@@ -104,18 +103,6 @@ <h4 id="more-info">More info</h4>
 <li><p><a target="_blank" href="https://packaging.python.org/en/latest/specifications/externally-managed-environments/">Externally Managed Environments @ PyPA</a></p></li>
 <li><p><a target="_blank" href="https://peps.python.org/pep-0668/">PEP 668 – Marking Python base environments as “externally managed”</a></p></li>
 </ul>
-<h3 id="notice-for-python-2-users">Notice for Python 2 users</h3>
-<p>If you are still using <strong>Python 2</strong> in a linux system, plase make sure “<strong>pip</strong>” is installed. Execute the following command to verify its existance:</p>
-<pre>python[2] -m pip list</pre>
-<p>If you get a response, you are good to go. Otherwise, use your distro package manager to install it.</p>
-<p>If your distro does not provide it (some do not anymore), use the following commands to get it:</p>
-<pre>    curl https://bootstrap.pypa.io/pip/2.7/get-pip.py \
-        --output get-pip.py
-    sudo python[2] get-pip.py</pre>
-<p>or</p>
-<pre>    wget https://bootstrap.pypa.io/pip/2.7/get-pip.py
-    sudo python[2] get-pip.py</pre>
-<p>When you are done, proceed to “<a href="linux.html">pip installation</a> (the old way)”, adapting the commands to python2.</p>
 <h3 id="installation-on-the-bsds">Installation on the BSDs</h3>
 <p>If you are on any of the BSDs, please do install <strong>bash</strong> beforehand and try to follow the <a href="linux.html">pip installation guide</a>.</p>
 <p>Please be aware that <strong>PyRadio</strong> is provided as a <strong>port</strong> on <a target="_blank" href="https://www.freshports.org/audio/py-pyradio/">FreeBSB</a>.</p>

diff --git a/docs/build.md b/docs/build.md
@@ -7,7 +7,6 @@
     * [What does it all mean and why should you care](#what-does-it-all-mean-and-why-should-you-care)
     * [When do I need to install pipx?](#when-do-i-need-to-install-pipx?)
         * [More info](#more-info)
-    * [Notice for Python 2 users](#notice-for-python-2-users)
     * [Installation on the BSDs](#installation-on-the-bsds)
     * [Rasberry Pi installation](#rasberry-pi-installation)
 * [Installation guides](#installation-guides)
@@ -85,33 +84,6 @@ If you get that message, or a similar one, it is time to install `pipx`.
 - [PEP 668 – Marking Python base environments as “externally managed”](https://peps.python.org/pep-0668/)
 
 
-### Notice for Python 2 users
-
-If you are still using **Python 2** in a linux system, plase make sure "**pip**" is installed. Execute the following command to verify its existance:
-
-```
-python[2] -m pip list
-```
-
-If you get a response, you are good to go. Otherwise, use your distro package manager to install it.
-
-If your distro does not provide it (some do not anymore), use the following commands to get it:
-
-```
-    curl https://bootstrap.pypa.io/pip/2.7/get-pip.py \
-        --output get-pip.py
-    sudo python[2] get-pip.py
-```
-
-or
-
-```
-    wget https://bootstrap.pypa.io/pip/2.7/get-pip.py
-    sudo python[2] get-pip.py
-```
-
-When you are done, proceed to  "[pip installation](linux.md) (the old way)", adapting the commands to python2.
-
 ### Installation on the BSDs
 
 If you are on any of the BSDs, please do install **bash** beforehand and try to follow the [pip installation guide](linux.md).

diff --git a/docs/index.html b/docs/index.html
@@ -158,7 +158,7 @@ <h2 id="features">Features <span style="padding-left: 10px;"><sup style="font-si
 <p>and much more…</p>
 <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></span></h2>
 <ul>
-<li>python 2.7/3.5+
+<li>python 3.7+
 <ul>
 <li>setuptools</li>
 <li>wheel</li>
@@ -176,6 +176,11 @@ <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;">
 
+2024-02-24 s-n-g
+    * version 0.9.2.25
+    * droping python 2 - PyRadio will only run on python 3
+    * fixing #228
+
 2024-01-12 s-n-g
     * version 0.9.2.24 (BUG FIX)
     * fixing mpv title parsing (once again)

diff --git a/docs/index.md b/docs/index.md
@@ -95,7 +95,7 @@ If you face this situation, please refer to [this page](pip-error.md) to resolve
 and much more...
 
 ## Requirements
-* python 2.7/3.5+
+* python 3.7+
     - setuptools
     - wheel
     - requests

diff --git a/docs/pyradio.1 b/docs/pyradio.1
@@ -2,7 +2,7 @@
 .\" Copyright (C) 2018-2024 Spiros Georgaras <[email protected]>
 .\" This manual is freely distributable under the terms of the GPL.
 .\"
-.TH pyradio 1 "January 2024" pyradio
+.TH pyradio 1 "February 2024" pyradio
 
 .SH Name
 .PP
@@ -603,7 +603,7 @@ A playlist that does not reside within the program’s configuration directory i
 
 When this happens, \fBpyradio\fR will offer you the choise to copy the playlist in its configuration directory, thus making it available for manipulation within the program.
 
-If a playlist of the same name already exists in the configuration directory, the "\fIforeign\fR" playlist will be time-stamped. For example, if a "\fIforeign\fR" playlist is named "\fIstations.csv\fR", it will be named "\fI2019-01-11_13-35-47_stations.csv\fR" (provided that the action was taked on January 11, 2019 at 13:35:47).
+If a playlist of the same name already exists in the configuration directory, the "\fIforeign\fR" playlist will be time-stamped. For example, if a "\fIforeign\fR" playlist is named "\fIstations.csv\fR", it will be named "\fI2019-01-11_13-35-47_stations.csv\fR" (provided that the action was taked on February 11, 2019 at 13:35:47).
 
 
 .PP

diff --git a/docs/pyradio_rb.1 b/docs/pyradio_rb.1
@@ -1,7 +1,7 @@
 .\" Copyright (C) 2018-2024 Spiros Georgaras <[email protected]>
 .\" This manual is freely distributable under the terms of the GPL.
 .\"
-.TH pyradio_rb 1 "January 2024" pyradio
+.TH pyradio_rb 1 "February 2024" pyradio
 
 .SH Name
 .PP

diff --git a/docs/pyradio_rec.1 b/docs/pyradio_rec.1
@@ -1,4 +1,4 @@
-.TH pyradio_rec 1 "January 2024" pyradio
+.TH pyradio_rec 1 "February 2024" pyradio
 
 .SH Name
 .PP

diff --git a/docs/pyradio_server.1 b/docs/pyradio_server.1
@@ -1,7 +1,7 @@
 .\" Copyright (C) 2018-2024 Spiros Georgaras <[email protected]>
 .\" This manual is freely distributable under the terms of the GPL.
 .\"
-.TH pyradio_server 1 "January 2024" pyradio
+.TH pyradio_server 1 "February 2024" pyradio
 
 .SH Name
 .PP

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "pyradio"
-version = "0.9.2.24"
+version = "0.9.2.25"
 authors = [
   { name="Ben Dowling", email="[email protected]" },
   { name="Spiros Georgaras", email="[email protected]" },

diff --git a/pyradio/__init__.py b/pyradio/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 " pyradio -- Console radio player. "
 
-version_info = (0, 9, 2, 24)
+version_info = (0, 9, 2, 25)
 
 # Set it to True if new stations have been
 # added to the package's stations.csv