use python 3 by default

yash-bhat · Dec 15, 2018 · 3f16665 · 3f16665
1 parent 8cc9f02
commit 3f16665
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 17 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -9,6 +9,7 @@ In order to help troubleshooting, be sure to include the following information:
 **Output of the [audio debugging script](https://github.com/alexa-pi/AlexaPi/wiki/Audio-setup-&-debugging#audio-debugging-script).**
 
 **Your OS (including version) where you are running AlexaPi:**
+_Note: Raspbian older than Stretch is not supported!_
 ```
 ```
 
@@ -17,7 +18,7 @@ In order to help troubleshooting, be sure to include the following information:
 
 ```
 
-**Python release (`python2 --version`):**
+**Python release (`python3 --version`):**
 ```
 
 ```

diff --git a/src/debug.bat b/src/debug.bat
@@ -2,6 +2,6 @@ echo off
 title AlexaPi for Windows
 cls
 
-python main.py -d
+python3 main.py -d
 
 pause
diff --git a/src/scripts/AlexaPi.service b/src/scripts/AlexaPi.service
@@ -11,7 +11,7 @@ After=network.target network-online.target sound.target
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/python /opt/AlexaPi/src/main.py --daemon
+ExecStart=/usr/bin/python3 /opt/AlexaPi/src/main.py --daemon
 
 User=alexapi
 Group=alexapi

diff --git a/src/scripts/inc/common.sh b/src/scripts/inc/common.sh
@@ -5,11 +5,11 @@ RUN_USER="alexapi"
 HOME_DIR="/var/lib/AlexaPi"
 
 function run_python {
-    python2 "$@"
+    python3 "$@"
 }
 
 function run_pip {
-    pip2 "$@"
+    pip3 "$@"
 }
 
 function init_classic {

diff --git a/src/scripts/inc/os/archlinux.sh b/src/scripts/inc/os/archlinux.sh
@@ -2,9 +2,8 @@
 
 function install_os {
     pacman -Sy
-    pacman -S base-devel git python2 python2-pip swig portaudio libpulse vlc sox libmad libid3tag gcc --noconfirm --needed
+    pacman -S base-devel git python python-pip swig portaudio libpulse vlc sox libmad libid3tag gcc --noconfirm --needed
 
-    install -Dm644 ./unit-overrides/force-python2.conf /etc/systemd/system/AlexaPi.service.d/force-python2.conf
     systemctl daemon-reload
 }
 

diff --git a/src/scripts/inc/os/debian.sh b/src/scripts/inc/os/debian.sh
@@ -2,7 +2,7 @@
 
 function install_os {
     apt-get update
-    apt-get install curl git build-essential python-dev python-setuptools swig libpulse-dev portaudio19-dev libportaudio2 vlc-nox sox libsox-fmt-mp3 -y
+    apt-get install curl git build-essential python3-dev python3-setuptools swig libpulse-dev portaudio19-dev libportaudio2 vlc-nox sox libsox-fmt-mp3 -y
     apt-get -y remove python-pip
     run_python -m easy_install pip
 }

diff --git a/src/scripts/initd_alexa.sh b/src/scripts/initd_alexa.sh
@@ -16,7 +16,7 @@ set -e
 
 NAME="AlexaPi"
 PIDFILE="/run/$NAME/$NAME.pid"
-DAEMON="/usr/bin/python /opt/AlexaPi/src/main.py"
+DAEMON="/usr/bin/python3 /opt/AlexaPi/src/main.py"
 DAEMON_OPTS="--daemon"
 RUN_USER="alexapi"
 RUN_GROUP="alexapi"

diff --git a/src/scripts/setup.bat b/src/scripts/setup.bat
@@ -12,7 +12,7 @@ echo -------------------------------------------
 
 echo Installing dependencies:
 
-python -m pip install -r "%apath%requirements.txt"
+python3 -m pip install -r "%apath%requirements.txt"
 
 pause
 cls
@@ -27,7 +27,7 @@ echo You HAVE TO set up Amazon keys in the config.yaml file now
 echo ######################################################################################################
 pause
 
-start python.exe auth_web.py
+start python3.exe auth_web.py
 
 echo =====
 echo Done!

diff --git a/src/scripts/unit-overrides/force-python2.conf b/src/scripts/unit-overrides/force-python2.conf
diff --git a/src/start.bat b/src/start.bat
@@ -2,6 +2,6 @@ echo off
 title AlexaPi for Windows
 cls
 
-python main.py
+python3 main.py
 
 pause