diff --git a/Changelog b/Changelog index 58ca4aa0..7f9ef874 100644 --- 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 index 2300042a..c79f001b 100644 --- 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 index 54c4e5d8..99a2fdeb 100755 --- 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 index a1152d2c..4b38d036 100644 --- a/docs/build.html +++ b/docs/build.html @@ -50,7 +50,6 @@

Table of Contents < -
  • Notice for Python 2 users
  • Installation on the BSDs
  • Rasberry Pi installation
    • @@ -104,18 +103,6 @@

    More info

  • Externally Managed Environments @ PyPA

  • PEP 668 – Marking Python base environments as “externally managed”

    • -

    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 (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.

    Please be aware that PyRadio is provided as a port on FreeBSB.

    diff --git a/docs/build.md b/docs/build.md index c3ae8ea9..9d2e3de9 100644 --- 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 index 7c58e7b9..f3730a5b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -158,7 +158,7 @@

    Features Requirements Top